minor: incorrect filename at the top of fg_gl2.h

[freeglut] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f403af..ec360e8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,7 +51,11 @@ ELSE()
 ENDIF()
 
 # OpenGL ES support
-OPTION(FREEGLUT_GLES "Use OpenGL ES (requires EGL)" OFF)
+IF(ANDROID)
+    OPTION(FREEGLUT_GLES "Use OpenGL ES (requires EGL)" ON)
+ELSE()
+    OPTION(FREEGLUT_GLES "Use OpenGL ES (requires EGL)" OFF)
+ENDIF()
 
 # option to build either as "glut" (ON) or "freeglut" (OFF)
 IF(WIN32)
@@ -348,6 +352,7 @@ ENDIF()
 
 INCLUDE(CheckFunctionExists)
 INCLUDE(CheckTypeSize)
+INCLUDE(CheckCCompilerFlag)
 CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H)
 CHECK_INCLUDE_FILES(unistd.h   HAVE_UNISTD_H)
 CHECK_INCLUDE_FILES(sys/time.h         HAVE_SYS_TIME_H)
@@ -466,7 +471,14 @@ ELSE()
         IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
             SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mandroid")
         ENDIF()
-        SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -gstabs+")
+        CHECK_C_COMPILER_FLAG(-O0 HAVE_O0_FLAG)
+        IF(HAVE_O0_FLAG)
+            SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")
+        ENDIF()
+        CHECK_C_COMPILER_FLAG(-gstabs+ HAVE_GSTABSP_FLAG)
+        IF(HAVE_gstabsp_FLAG)
+            SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -gstabs+")
+        ENDIF()
     ENDIF()
 ENDIF()
 IF(FREEGLUT_BUILD_SHARED_LIBS)