diff options
| author | Tobias Arrskog <topfs2@xbmc.org> | 2014-08-06 16:11:07 +0200 |
|---|---|---|
| committer | Frank Raeznberg <frank@zzattack.org> | 2014-10-26 23:22:47 +0100 |
| commit | 6b74885e9331e2f570ea7a555518e03cded9537c (patch) | |
| tree | a70b3b8b9569b479de446b4318072c10d994c7b2 /configure.in | |
| parent | 27a73772125b42cb45b9f8a15c18bb781f03d868 (diff) | |
[configure] Moved xbmc to SDL2
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/configure.in b/configure.in index d4d2fa6d11..5f7de64e67 100644 --- a/configure.in +++ b/configure.in @@ -1036,7 +1036,7 @@ else fi else AC_MSG_RESULT(== WARNING: OpenGL support is disabled. ${APP_NAME} will run VERY slow. ==) - AC_CHECK_LIB([SDL_gfx],[main]) + AC_CHECK_LIB([SDL2_gfx],[main]) fi fi @@ -1199,8 +1199,9 @@ AC_SEARCH_LIBS([__dn_expand],resolv) # platform dependent libraries if test "$host_vendor" = "apple" ; then if test "$use_arch" != "arm"; then - AC_CHECK_LIB([SDL], [main],, AC_MSG_ERROR($missing_library)) + AC_CHECK_LIB([SDL2], [main],, AC_MSG_ERROR($missing_library)) AC_DEFINE([HAVE_SDL],[1],["Define to 1 if using sdl"]) + AC_DEFINE([SDL_VERSION],[1],["SDL major version"]) fi else if test "$target_platform" != "target_android" ; then @@ -1220,9 +1221,15 @@ else AC_MSG_NOTICE($dbus_disabled) fi if test "x$use_sdl" != "xno"; then - PKG_CHECK_MODULES([SDL], [sdl], - [INCLUDES="$INCLUDES $SDL_CFLAGS"; LIBS="$LIBS $SDL_LIBS"], - AC_MSG_ERROR($missing_library)) + PKG_CHECK_MODULES([SDL2], [sdl2], + [AC_DEFINE([SDL_VERSION],[2],["SDL major version"]) + INCLUDES="$INCLUDES $SDL2_CFLAGS"; LIBS="$LIBS $SDL2_LIBS";], + [PKG_CHECK_MODULES([SDL], [sdl], + [AC_DEFINE([SDL_VERSION],[1],["SDL major version"]) + INCLUDES="$INCLUDES $SDL_CFLAGS"; LIBS="$LIBS $SDL_LIBS"; use_joystick=no], + [AC_MSG_ERROR($missing_library)]) + ] + ) AC_CHECK_LIB([SDL_image], [main],, AC_MSG_ERROR($missing_library)) AC_DEFINE([HAVE_SDL],[1],["Define to 1 if using sdl"]) fi |