From 3cc0e400cdb55ce90761de747dea2b8185bc2cd7 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Tue, 25 Mar 2014 17:38:41 +0100 Subject: [PATCH] build: Disallow non-working sdl + opengl ES combination To build SDL with OpenGL ES we need a SDL version which ships these headers which only starts with SDL 2.x. So we only allow it for full OpenGL right now until someone wants to port our code over to SDL 2.x Fixes T856 @fix --- configure.ac | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 672e1baa15..4001d29e5a 100644 --- a/configure.ac +++ b/configure.ac @@ -1177,8 +1177,14 @@ if test "${want_sdl}" = "yes"; then EFL_PKG_CHECK_STRICT([sdl >= 1.2.0]) fi +# We only enable SDL with opengl if it is not the full version and not ES +# This can be changed if we ported our SDL code over to SDL 2.0. For older +# versions the SDL_opengles.h has never been released. want_gl_sdl="no" -if test "${want_sdl}" = "yes" && test "${with_opengl}" != "none"; then +if test "${want_sdl}" = "yes" && test "${with_opengl}" = "es"; then + AC_MSG_ERROR([We currently do not support SDL with OpenGL ES. Please consider full OpenGL if you want to use it with SDL.]) +fi +if test "${want_sdl}" = "yes" && test "${with_opengl}" = "full"; then want_gl_sdl="yes" fi