summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-01-11 13:47:41 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-01-11 15:46:24 +0900
commit1f7e8d4253cf5265cba5a8968fb43fa720dde934 (patch)
treea9420ae547a9ab86ceb0887061851b97064cbbdc /configure.ac
parent687df102d67d118b92e43504be48f88fd1e96ea8 (diff)
configure: Fail if opengl=full is used with EGL
So many problems from people who customize their builds in this incompatible manner. There really should be only one configure option as we don't support opengl+egl (although possible in theory) or gles without egl. Keeping both to not break existing builds.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac18
1 files changed, 16 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 35c166b..5e4865e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1636,7 +1636,7 @@ if test "${want_sdl}" = "yes"; then
1636 EFL_PKG_CHECK_STRICT([sdl2 >= 2.0.0]) 1636 EFL_PKG_CHECK_STRICT([sdl2 >= 2.0.0])
1637fi 1637fi
1638 1638
1639# We only enable SDL with opengl if it is not the full version and not ES 1639# We only enable SDL with opengl if it is the full version and not ES
1640# This can be changed if we ported our SDL code over to SDL 2.0. For older 1640# This can be changed if we ported our SDL code over to SDL 2.0. For older
1641# versions the SDL_opengles.h has never been released. 1641# versions the SDL_opengles.h has never been released.
1642want_gl_sdl="no" 1642want_gl_sdl="no"
@@ -1829,6 +1829,14 @@ AC_ARG_ENABLE([egl],
1829 ], 1829 ],
1830 [want_egl="no"]) 1830 [want_egl="no"])
1831 1831
1832# Verify OpenGL + EGL modes match (full+glx or es+egl)
1833if test "x${want_egl}" = "xyes" && test "x${with_opengl}" != "xes" ; then
1834 AC_MSG_ERROR([Full OpenGL with EGL is not supported, please add --with-opengl=es to your configure options to switch to EGL + OpenGL ES.])
1835fi
1836if test "x${want_egl}" = "xno" && test "x${with_opengl}" = "xes" ; then
1837 AC_MSG_ERROR([OpenGL ES requires EGL, please add --enable-egl to your configure options to switch to EGL + OpenGL ES.])
1838fi
1839
1832# Pixman 1840# Pixman
1833AC_ARG_ENABLE([pixman], 1841AC_ARG_ENABLE([pixman],
1834 [AS_HELP_STRING([--enable-pixman],[enable pixman for software rendering. @<:@default=disabled@:>@])], 1842 [AS_HELP_STRING([--enable-pixman],[enable pixman for software rendering. @<:@default=disabled@:>@])],
@@ -5247,6 +5255,12 @@ else
5247 osname="${host_os}" 5255 osname="${host_os}"
5248fi 5256fi
5249 5257
5258if test "x${want_egl}" = "xyes" ; then
5259 opengl_egl="(EGL)"
5260else
5261 opengl_egl=""
5262fi
5263
5250echo "Configuration...: ${COLOR_OTHER}profile=${build_profile} os=${osname}${COLOR_RESET}" 5264echo "Configuration...: ${COLOR_OTHER}profile=${build_profile} os=${osname}${COLOR_RESET}"
5251echo " EFL API Set...: ${efl_api}" 5265echo " EFL API Set...: ${efl_api}"
5252echo " CPU Extensions: ${host_cpu} (${features_cpu})" 5266echo " CPU Extensions: ${host_cpu} (${features_cpu})"
@@ -5254,7 +5268,7 @@ echo " System Feature: ${features_system}"
5254echo " Threads.......: ${efl_have_threads} (${features_thread})" 5268echo " Threads.......: ${efl_have_threads} (${features_thread})"
5255echo " Cryptography..: ${build_crypto}" 5269echo " Cryptography..: ${build_crypto}"
5256echo " X11...........: ${with_x11}" 5270echo " X11...........: ${with_x11}"
5257echo " OpenGL........: ${with_opengl}" 5271echo " OpenGL........: ${with_opengl} ${opengl_egl}"
5258echo " C++11.........: ${have_cxx11}" 5272echo " C++11.........: ${have_cxx11}"
5259echo " JavaScript....: ${want_js}" 5273echo " JavaScript....: ${want_js}"
5260echo " JavaScript flg: $EINA_JS_LIBS" 5274echo " JavaScript flg: $EINA_JS_LIBS"