Commit bebc8d126de66733a6f37b5950c6f36d25a0e454
2014-10-13T10:43:10
Added configure options to disable OpenGL ES 1.1 and 2.0 individually
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86
diff --git a/configure.in b/configure.in
index 528a7a8..5091c6e 100644
--- a/configure.in
+++ b/configure.in
@@ -1973,6 +1973,12 @@ dnl Check to see if OpenGL ES support is desired
AC_ARG_ENABLE(video-opengles,
AC_HELP_STRING([--enable-video-opengles], [include OpenGL ES support [[default=yes]]]),
, enable_video_opengles=yes)
+AC_ARG_ENABLE(video-opengles1,
+AC_HELP_STRING([--enable-video-opengles1], [include OpenGL ES 1.1 support [[default=yes]]]),
+ , enable_video_opengles1=yes)
+AC_ARG_ENABLE(video-opengles2,
+AC_HELP_STRING([--enable-video-opengles2], [include OpenGL ES 2.0 support [[default=yes]]]),
+ , enable_video_opengles2=yes)
dnl Find OpenGL ES
CheckOpenGLESX11()
@@ -1993,36 +1999,40 @@ CheckOpenGLESX11()
AC_DEFINE(SDL_VIDEO_OPENGL_EGL, 1, [ ])
fi
- AC_MSG_CHECKING(for OpenGL ES v1 headers)
- video_opengles_v1=no
- AC_TRY_COMPILE([
- #include <GLES/gl.h>
- #include <GLES/glext.h>
- ],[
- ],[
- video_opengles_v1=yes
- ])
- AC_MSG_RESULT($video_opengles_v1)
- if test x$video_opengles_v1 = xyes; then
- AC_DEFINE(SDL_VIDEO_OPENGL_ES, 1, [ ])
- AC_DEFINE(SDL_VIDEO_RENDER_OGL_ES, 1, [ ])
- SUMMARY_video="${SUMMARY_video} opengl_es1"
+ if test x$enable_video_opengles1 = xyes; then
+ AC_MSG_CHECKING(for OpenGL ES v1 headers)
+ video_opengles_v1=no
+ AC_TRY_COMPILE([
+ #include <GLES/gl.h>
+ #include <GLES/glext.h>
+ ],[
+ ],[
+ video_opengles_v1=yes
+ ])
+ AC_MSG_RESULT($video_opengles_v1)
+ if test x$video_opengles_v1 = xyes; then
+ AC_DEFINE(SDL_VIDEO_OPENGL_ES, 1, [ ])
+ AC_DEFINE(SDL_VIDEO_RENDER_OGL_ES, 1, [ ])
+ SUMMARY_video="${SUMMARY_video} opengl_es1"
+ fi
fi
- AC_MSG_CHECKING(for OpenGL ES v2 headers)
- video_opengles_v2=no
- AC_TRY_COMPILE([
- #include <GLES2/gl2.h>
- #include <GLES2/gl2ext.h>
- ],[
- ],[
- video_opengles_v2=yes
- ])
- AC_MSG_RESULT($video_opengles_v2)
- if test x$video_opengles_v2 = xyes; then
- AC_DEFINE(SDL_VIDEO_OPENGL_ES2, 1, [ ])
- AC_DEFINE(SDL_VIDEO_RENDER_OGL_ES2, 1, [ ])
- SUMMARY_video="${SUMMARY_video} opengl_es2"
+ if test x$enable_video_opengles2 = xyes; then
+ AC_MSG_CHECKING(for OpenGL ES v2 headers)
+ video_opengles_v2=no
+ AC_TRY_COMPILE([
+ #include <GLES2/gl2.h>
+ #include <GLES2/gl2ext.h>
+ ],[
+ ],[
+ video_opengles_v2=yes
+ ])
+ AC_MSG_RESULT($video_opengles_v2)
+ if test x$video_opengles_v2 = xyes; then
+ AC_DEFINE(SDL_VIDEO_OPENGL_ES2, 1, [ ])
+ AC_DEFINE(SDL_VIDEO_RENDER_OGL_ES2, 1, [ ])
+ SUMMARY_video="${SUMMARY_video} opengl_es2"
+ fi
fi
fi
}