Separate EGL / GL ES detection in CMake
authorGabriel Jacobo <gabomdq@gmail.com>
Thu, 22 Aug 2013 14:56:07 -0300
changeset 7690 76d7b6007a64
parent 7689 c64896ddeeae
child 7691 cf99258f905c
Separate EGL / GL ES detection in CMake
cmake/sdlchecks.cmake
include/SDL_config.h.cmake
--- a/cmake/sdlchecks.cmake	Thu Aug 22 13:32:27 2013 -0400
+++ b/cmake/sdlchecks.cmake	Thu Aug 22 14:56:07 2013 -0300
@@ -563,25 +563,29 @@
   if(VIDEO_OPENGLES)
     check_c_source_compiles("
         #include <EGL/egl.h>
-        int main (int argc, char** argv) {}" HAVE_VIDEO_OPENGLES)
-    if(HAVE_VIDEO_OPENGLES)
-      check_c_source_compiles("
-          #include <GLES/gl.h>
-          #include <GLES/glext.h>
-          int main (int argc, char** argv) {}" HAVE_VIDEO_OPENGLES_V1)
-      if(HAVE_VIDEO_OPENGLES_V1)
+        int main (int argc, char** argv) {}" HAVE_VIDEO_OPENGL_EGL)
+    if(HAVE_VIDEO_OPENGL_EGL)
+        set(SDL_VIDEO_OPENGL_EGL 1)
+    endif(HAVE_VIDEO_OPENGL_EGL) 
+    check_c_source_compiles("
+      #include <GLES/gl.h>
+      #include <GLES/glext.h>
+      int main (int argc, char** argv) {}" HAVE_VIDEO_OPENGLES_V1)
+    if(HAVE_VIDEO_OPENGLES_V1)
+        set(HAVE_VIDEO_OPENGLES TRUE)
         set(SDL_VIDEO_OPENGL_ES 1)
         set(SDL_VIDEO_RENDER_OGL_ES 1)
-      endif(HAVE_VIDEO_OPENGLES_V1)
-      check_c_source_compiles("
-          #include <GLES2/gl2.h>
-          #include <GLES2/gl2ext.h>
-          int main (int argc, char** argv) {}" HAVE_VIDEO_OPENGLES_V2)
-      if(HAVE_VIDEO_OPENGLES_V2)
+    endif(HAVE_VIDEO_OPENGLES_V1)
+    check_c_source_compiles("
+      #include <GLES2/gl2.h>
+      #include <GLES2/gl2ext.h>
+      int main (int argc, char** argv) {}" HAVE_VIDEO_OPENGLES_V2)
+    if(HAVE_VIDEO_OPENGLES_V2)
+        set(HAVE_VIDEO_OPENGLES TRUE)
         set(SDL_VIDEO_OPENGL_ES2 1)
         set(SDL_VIDEO_RENDER_OGL_ES2 1)
-      endif(HAVE_VIDEO_OPENGLES_V2)
-    endif(HAVE_VIDEO_OPENGLES)
+    endif(HAVE_VIDEO_OPENGLES_V2)
+
   endif(VIDEO_OPENGLES)
 endmacro(CheckOpenGLESX11)
 
--- a/include/SDL_config.h.cmake	Thu Aug 22 13:32:27 2013 -0400
+++ b/include/SDL_config.h.cmake	Thu Aug 22 14:56:07 2013 -0300
@@ -293,6 +293,7 @@
 #cmakedefine SDL_VIDEO_OPENGL_CGL @SDL_VIDEO_OPENGL_CGL@
 #cmakedefine SDL_VIDEO_OPENGL_GLX @SDL_VIDEO_OPENGL_GLX@
 #cmakedefine SDL_VIDEO_OPENGL_WGL @SDL_VIDEO_OPENGL_WGL@
+#cmakedefine SDL_VIDEO_OPENGL_EGL @SDL_VIDEO_OPENGL_EGL@
 #cmakedefine SDL_VIDEO_OPENGL_OSMESA @SDL_VIDEO_OPENGL_OSMESA@
 #cmakedefine SDL_VIDEO_OPENGL_OSMESA_DYNAMIC @SDL_VIDEO_OPENGL_OSMESA_DYNAMIC@