X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=CMakeLists.txt;h=25aadc0a8edb348a145dedd37607fd754cda20ba;hb=223d39f2318e1724283c50c346843199c81d2e7c;hp=05ee255423a34f082f0882bed65a1b8bb2350bd2;hpb=be0851a736f7a14a550e113c17634c93df90677b;p=freeglut

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05ee255..25aadc0 100644
--- 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)
@@ -98,13 +102,16 @@ ELSEIF(ANDROID)
         src/egl/fg_internal_egl.h
         src/egl/fg_display_egl.c
         src/egl/fg_init_egl.c
+        src/egl/fg_state_egl.c
         src/egl/fg_structure_egl.c
+        src/egl/fg_structure_egl.h
         src/egl/fg_window_egl.c
         src/egl/fg_window_egl.h
         src/android/native_app_glue/android_native_app_glue.c
         src/android/native_app_glue/android_native_app_glue.h
         src/android/fg_runtime_android.c
         src/android/fg_gamemode_android.c
+        src/android/fg_structure_android.c
         src/android/fg_init_android.c
         src/android/fg_input_devices_android.c
         src/android/fg_joystick_android.c
@@ -112,7 +119,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()
@@ -147,7 +153,7 @@ IF(FREEGLUT_GLES2)
   LIST(APPEND LIBS GLESv2 EGL)
 ELSEIF(FREEGLUT_GLES1)
   ADD_DEFINITIONS(-DFREEGLUT_GLES1)
-  LIST(APPEND LIBS GLESv1 EGL)
+  LIST(APPEND LIBS GLESv1_CM EGL)
 ELSE()
   FIND_PACKAGE(OpenGL REQUIRED)
   LIST(APPEND LIBS ${OPENGL_gl_LIBRARY})
@@ -357,10 +363,20 @@ ENDIF()
 # Define static build dependencies
 IF(WIN32)
   SET(PC_LIBS_PRIVATE "-lopengl32 -lwinmm -lgdi32")
-ELSEIF(ANDROID)
-  SET(PC_LIBS_PRIVATE "-llog -landroid -lGLESv2 -lEGL")
+ELSEIF(FREEGLUT_GLES2)
+  IF(ANDROID)
+    SET(PC_LIBS_PRIVATE "-llog -landroid -lGLESv2 -lEGL")
+  ELSE()
+    SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv2 -lEGL")
+  ENDIF()
+ELSEIF(FREEGLUT_GLES1)
+  IF(ANDROID)
+    SET(PC_LIBS_PRIVATE "-llog -landroid -lGLESv1_CM -lEGL")
+  ELSE()
+    SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv1_CM -lEGL")
+  ENDIF()
 ELSE()
-  SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv2 -lEGL")
+  SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGL")
 ENDIF()
 # Client applications need to define FreeGLUT GLES version to
 # bootstrap headers inclusion in freeglut_std.h: