Move OpenGL ES stubs out of Android

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1175 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05ee255..a23bd02 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,6 +66,10 @@ IF(NOT FREEGLUT_GLES2 AND NOT FREEGLUT_GLES1)
         src/fg_menu.c
         src/fg_teapot.c
     )
+ELSE()
+    LIST(APPEND FREEGLUT_SRCS
+        src/gles_stubs.c
+    )
 ENDIF()
 
 IF(WIN32)
@@ -112,7 +116,6 @@ ELSEIF(ANDROID)
         src/android/fg_spaceball_android.c
         src/android/fg_state_android.c
         src/android/fg_window_android.c
-        src/android/opengles_stubs.c
         src/android/fg_internal_android.h
     )
 ELSE()

diff --git a/src/android/opengles_stubs.c b/src/android/opengles_stubs.c
deleted file mode 100644 (file)
index c8437ce..0000000
--- a/src/android/opengles_stubs.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <GL/freeglut.h>
-#include "fg_internal.h"
-
-void fgDeactivateMenu( SFG_Window *window ) {
-  fprintf(stderr, "fgDeactivateMenu: STUB\n");
-}
-void fgDisplayMenu( void ) {
-  fprintf(stderr, "fgDisplayMenu: STUB\n");
-}

diff --git a/src/gles_stubs.c b/src/gles_stubs.c
new file mode 100644 (file)
index 0000000..c8437ce
--- /dev/null
+++ b/src/gles_stubs.c
@@ -0,0 +1,9 @@
+#include <GL/freeglut.h>
+#include "fg_internal.h"
+
+void fgDeactivateMenu( SFG_Window *window ) {
+  fprintf(stderr, "fgDeactivateMenu: STUB\n");
+}
+void fgDisplayMenu( void ) {
+  fprintf(stderr, "fgDisplayMenu: STUB\n");
+}