X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=CMakeLists.txt;h=8b3c49be4e6f6a06f1d740a9bfe9cef30bd06fe3;hb=93284cce995c8be6950de7858c5200013e63afa0;hp=828b7b22ddb47ee913ff1b3865278b2d9e3180d8;hpb=323957de8fd714ca523b8ff45dbb711da09d6693;p=freeglut

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 828b7b2..8b3c49b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,10 +46,12 @@ SET(FREEGLUT_SRCS
     src/fg_gl2.c
     src/fg_gl2.h
     src/fg_init.c
+    src/fg_init.h
     src/fg_internal.h
     src/fg_input_devices.c
     src/fg_joystick.c
     src/fg_main.c
+    src/fg_main.h
     src/fg_misc.c
     src/fg_overlay.c
     src/fg_spaceball.c
@@ -103,15 +105,6 @@ IF(WIN32)
 
 ELSEIF(ANDROID)
     LIST(APPEND FREEGLUT_SRCS
-        src/egl/fg_internal_egl.h
-        src/egl/fg_display_egl.c
-        src/egl/fg_ext_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_internal_android.h
@@ -122,6 +115,7 @@ ELSEIF(ANDROID)
         src/android/fg_input_devices_android.c
         src/android/fg_joystick_android.c
         src/android/fg_main_android.c
+        src/android/fg_main_android.h
         src/android/fg_runtime_android.c
         src/android/fg_spaceball_android.c
         src/android/fg_state_android.c
@@ -146,26 +140,32 @@ ELSE()
         src/x11/fg_window_x11.c
         src/x11/fg_xinput_x11.c
     )
-    IF(FREEGLUT_GLES2 OR FREEGLUT_GLES1)
-        LIST(APPEND FREEGLUT_SRCS
-            src/egl/fg_internal_egl.h
-            src/egl/fg_display_egl.c
-            src/egl/fg_ext_egl.c
-            src/egl/fg_init_egl.c
-            src/egl/fg_state_egl.c
-            src/egl/fg_structure_egl.c
-            src/egl/fg_window_egl.c
-        )
-    ELSE()
+    IF(NOT(FREEGLUT_GLES2 OR FREEGLUT_GLES1))
         LIST(APPEND FREEGLUT_SRCS
             src/x11/fg_internal_x11_glx.h
             src/x11/fg_display_x11_glx.c
             src/x11/fg_state_x11_glx.c
+            src/x11/fg_state_x11_glx.h
             src/x11/fg_window_x11_glx.c
             src/x11/fg_window_x11_glx.h
         )
     ENDIF()
 ENDIF()
+IF(FREEGLUT_GLES2 OR FREEGLUT_GLES1)
+    LIST(APPEND FREEGLUT_SRCS
+        src/egl/fg_internal_egl.h
+        src/egl/fg_display_egl.c
+        src/egl/fg_ext_egl.c
+        src/egl/fg_init_egl.c
+        src/egl/fg_init_egl.h
+        src/egl/fg_state_egl.c
+        src/egl/fg_state_egl.h
+        src/egl/fg_structure_egl.c
+        src/egl/fg_structure_egl.h
+        src/egl/fg_window_egl.c
+        src/egl/fg_window_egl.h
+    )
+ENDIF()
 
 # For OpenGL ES (GLES):
 # - compile with -DFREEGLUT_GLES1 and -DFREEGLUT_GLES2 to cleanly
@@ -196,7 +196,7 @@ IF(WIN32)
 ENDIF()
 
 IF(CMAKE_COMPILER_IS_GNUCC)
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
   IF(!ANDROID)
     # not setting -ansi as EGL/KHR headers doesn't support it
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ansi")