summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-08-06 00:40:43 -0400
committerStefan Schmidt <stefan@datenfreihafen.org>2015-08-24 08:47:03 +0200
commitf05ec7fc831b28482bb08928a05606469cff213d (patch)
treeab8188ee3719053651ddac9f4c7b4c344aadd904
parente004a76d1967e6cc0408c100f5623fd074483f64 (diff)
use SDL2 everywhere
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 <badbit@me.com> Reported-by: Romain Naour <romain.naour@openwide.fr>
-rw-r--r--configure.ac4
-rw-r--r--m4/evas_check_engine.m44
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_common.h4
-rw-r--r--src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h2
4 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index c96d60a9d4..b008abac86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1958,13 +1958,13 @@ AC_SUBST([have_evas_engine_gl_xcb])
1958if test "x$have_evas_engine_gl_sdl" = "xyes" || test "x$have_evas_engine_gl_sdl" = "xstatic" ; then 1958if test "x$have_evas_engine_gl_sdl" = "xyes" || test "x$have_evas_engine_gl_sdl" = "xstatic" ; then
1959 AC_CHECK_DECL([SDL_GL_CONTEXT_MAJOR_VERSION], 1959 AC_CHECK_DECL([SDL_GL_CONTEXT_MAJOR_VERSION],
1960 [AC_DEFINE([HAVE_SDL_GL_CONTEXT_VERSION], [1], [SDL_GL version attributes present])],, 1960 [AC_DEFINE([HAVE_SDL_GL_CONTEXT_VERSION], [1], [SDL_GL version attributes present])],,
1961 [#include <SDL/SDL_video.h>]) 1961 [#include <SDL2/SDL_video.h>])
1962fi 1962fi
1963 1963
1964if test "${with_opengl}" = "es"; then 1964if test "${with_opengl}" = "es"; then
1965 AC_CHECK_DECL([SDL_OPENGLES], 1965 AC_CHECK_DECL([SDL_OPENGLES],
1966 [AC_DEFINE([HAVE_SDL_FLAG_OPENGLES], [1], [SDL_OPENGLES flag is present])],, 1966 [AC_DEFINE([HAVE_SDL_FLAG_OPENGLES], [1], [SDL_OPENGLES flag is present])],,
1967 [#include <SDL/SDL_video.h>]) 1967 [#include <SDL2/SDL_video.h>])
1968fi 1968fi
1969 1969
1970# OpenGL common 1970# OpenGL common
diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index 8165aa2344..b03584407e 100644
--- a/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@ -478,11 +478,11 @@ if test "x${have_dep}" = "xyes" ; then
478 evas_engine_[]$1[]_libs="${evas_engine_[]$1[]_libs} -lGL -lm $gl_pt_lib" 478 evas_engine_[]$1[]_libs="${evas_engine_[]$1[]_libs} -lGL -lm $gl_pt_lib"
479 evas_engine_gl_common_libs="-lGL -lm $gl_pt_lib" 479 evas_engine_gl_common_libs="-lGL -lm $gl_pt_lib"
480else 480else
481 AC_CHECK_HEADER([SDL/SDL_opengles.h], 481 AC_CHECK_HEADER([SDL2/SDL_opengles.h],
482 [have_egl="yes"], 482 [have_egl="yes"],
483 [have_egl="no"], 483 [have_egl="no"],
484 [ 484 [
485#include <SDL/SDL_opengles.h> 485#include <SDL2/SDL_opengles.h>
486#include <EGL/egl.h> 486#include <EGL/egl.h>
487 ]) 487 ])
488 if test "x${have_egl}" = "xyes" ; then 488 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 d40833b26b..1356610472 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 @@
25#else 25#else
26# ifdef _EVAS_ENGINE_SDL_H 26# ifdef _EVAS_ENGINE_SDL_H
27# ifdef GL_GLES 27# ifdef GL_GLES
28# include <SDL/SDL_opengles.h> 28# include <SDL2/SDL_opengles.h>
29# else 29# else
30# include <SDL/SDL_opengl.h> 30# include <SDL2/SDL_opengl.h>
31# endif 31# endif
32# else 32# else
33# ifdef GL_GLES 33# 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 de2370edd2..58f333e8e2 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 @@
1#ifndef _EVAS_ENGINE_GL_SDL_H 1#ifndef _EVAS_ENGINE_GL_SDL_H
2#define _EVAS_ENGINE_GL_SDL_H 2#define _EVAS_ENGINE_GL_SDL_H
3 3
4#include <SDL/SDL.h> 4#include <SDL2/SDL.h>
5 5
6typedef struct _Evas_Engine_Info_GL_SDL Evas_Engine_Info_GL_SDL; 6typedef struct _Evas_Engine_Info_GL_SDL Evas_Engine_Info_GL_SDL;
7 7