diff options
| author | S. Davilla <davilla@4pi.com> | 2015-08-26 13:31:42 -0400 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2015-09-10 12:22:11 +0200 |
| commit | 8373e3e5f6f4b32458e1f9c9083e61633c508f0e (patch) | |
| tree | 5ff21f34c891bb8b711385d8275f1e82a96a59d0 /configure.ac | |
| parent | 3345e15be207cde5667ae42318339a8baa660f7f (diff) | |
fixed compiler warnings, do not over-ride SDL defines with our own junk
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 7084e9fd31..0f7b3df6c6 100644 --- a/configure.ac +++ b/configure.ac @@ -1239,7 +1239,7 @@ if test "$host_vendor" = "apple" ; then if test "$use_arch" != "arm"; then AC_CHECK_LIB([SDL], [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"]) + AC_DEFINE([HAVE_SDL_VERSION],[1],["SDL major version"]) fi else if test "$target_platform" != "target_android" ; then @@ -1262,7 +1262,7 @@ fi # joystick if test "$use_joystick" != "no"; then PKG_CHECK_MODULES([SDL2], [sdl2], - [AC_DEFINE([SDL_VERSION],[2],["SDL major version"]) + [AC_DEFINE([HAVE_SDL_VERSION],[2],["SDL major version"]) AC_DEFINE([HAVE_SDL],[1],["Define to 1 if using sdl"]) INCLUDES="$INCLUDES $SDL2_CFLAGS"; LIBS="$LIBS $SDL2_LIBS"; use_joystick="yes"], [if test "$use_joystick" = "yes"; then |