Hi Mike, Le 06/08/2015 06:42, Mike Frysinger a écrit : > Some files were still including SDL-1 headers even though we only link > against SDL2 libs. > > URL: https://bugs.gentoo.org/551882 > Reported-by: Barnaby <[email protected]> > ---
I've also reported this issue some weeks ago: http://sourceforge.net/p/enlightenment/mailman/message/34274895/ It seems the sdl2 support hasn't be build/tested since a while. Best regards, Romain Naour > configure.ac | 4 ++-- > m4/evas_check_engine.m4 | 4 ++-- > src/modules/evas/engines/gl_common/evas_gl_common.h | 4 ++-- > src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h | 2 +- > 4 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 8101347..5b51ea1 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1958,13 +1958,13 @@ AC_SUBST([have_evas_engine_gl_xcb]) > if test "x$have_evas_engine_gl_sdl" = "xyes" || test > "x$have_evas_engine_gl_sdl" = "xstatic" ; then > AC_CHECK_DECL([SDL_GL_CONTEXT_MAJOR_VERSION], > [AC_DEFINE([HAVE_SDL_GL_CONTEXT_VERSION], [1], [SDL_GL version > attributes present])],, > - [#include <SDL/SDL_video.h>]) > + [#include <SDL2/SDL_video.h>]) > fi > > if test "${with_opengl}" = "es"; then > AC_CHECK_DECL([SDL_OPENGLES], > [AC_DEFINE([HAVE_SDL_FLAG_OPENGLES], [1], [SDL_OPENGLES flag is > present])],, > - [#include <SDL/SDL_video.h>]) > + [#include <SDL2/SDL_video.h>]) > fi > > # OpenGL common > diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4 > index 55135d1..8f54f2d 100644 > --- a/m4/evas_check_engine.m4 > +++ b/m4/evas_check_engine.m4 > @@ -478,11 +478,11 @@ if test "x${have_dep}" = "xyes" ; then > evas_engine_[]$1[]_libs="${evas_engine_[]$1[]_libs} -lGL -lm $gl_pt_lib" > evas_engine_gl_common_libs="-lGL -lm $gl_pt_lib" > else > - AC_CHECK_HEADER([SDL/SDL_opengles.h], > + AC_CHECK_HEADER([SDL2/SDL_opengles.h], > [have_egl="yes"], > [have_egl="no"], > [ > -#include <SDL/SDL_opengles.h> > +#include <SDL2/SDL_opengles.h> > #include <EGL/egl.h> > ]) > if test "x${have_egl}" = "xyes" ; then > diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h > b/src/modules/evas/engines/gl_common/evas_gl_common.h > index d40833b..1356610 100644 > --- a/src/modules/evas/engines/gl_common/evas_gl_common.h > +++ b/src/modules/evas/engines/gl_common/evas_gl_common.h > @@ -25,9 +25,9 @@ > #else > # ifdef _EVAS_ENGINE_SDL_H > # ifdef GL_GLES > -# include <SDL/SDL_opengles.h> > +# include <SDL2/SDL_opengles.h> > # else > -# include <SDL/SDL_opengl.h> > +# include <SDL2/SDL_opengl.h> > # endif > # else > # ifdef GL_GLES > diff --git a/src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h > b/src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h > index de2370e..58f333e 100644 > --- a/src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h > +++ b/src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h > @@ -1,7 +1,7 @@ > #ifndef _EVAS_ENGINE_GL_SDL_H > #define _EVAS_ENGINE_GL_SDL_H > > -#include <SDL/SDL.h> > +#include <SDL2/SDL.h> > > typedef struct _Evas_Engine_Info_GL_SDL Evas_Engine_Info_GL_SDL; > > ------------------------------------------------------------------------------ _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
