summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2014-01-25 09:18:07 +0100
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2014-01-25 09:18:07 +0100
commit3137a1a7b54da179f89a8e1ba3638b0378d6286d (patch)
tree705af3920d0e1b2a9b2515ea1586a44f25192eed
parentfd1f8ed49013f6cbd97c6cb4f2663a424e2acbb8 (diff)
downloadmpv-3137a1a7b54da179f89a8e1ba3638b0378d6286d.tar.bz2
mpv-3137a1a7b54da179f89a8e1ba3638b0378d6286d.tar.xz
build: fix usage of HAVE_SDL1 define
This is needed after fd1f8ed49.
-rw-r--r--audio/out/ao.c2
-rwxr-xr-xold-configure6
2 files changed, 4 insertions, 4 deletions
diff --git a/audio/out/ao.c b/audio/out/ao.c
index 4530b1c3b7..8f70865afa 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -81,7 +81,7 @@ static const struct ao_driver * const audio_out_drivers[] = {
#if HAVE_OPENAL
&audio_out_openal,
#endif
-#if HAVE_SDL || HAVE_SDL2
+#if HAVE_SDL1 || HAVE_SDL2
&audio_out_sdl,
#endif
&audio_out_null,
diff --git a/old-configure b/old-configure
index b77b1bd8ae..16a43e4d7b 100755
--- a/old-configure
+++ b/old-configure
@@ -2206,7 +2206,7 @@ if test "$_sdl2" = yes ; then
fi
if test "$_sdl2" = yes ; then
_sdl=yes # sdl2 implies sdl
- def_sdl='#define HAVE_SDL 1'
+ def_sdl='#define HAVE_SDL1 1'
def_sdl2='#define HAVE_SDL2 1'
vomodules="sdl $vomodules"
aomodules="sdl $aomodules"
@@ -2219,11 +2219,11 @@ else
pkg_config_add 'sdl' && _sdl=yes
fi
if test "$_sdl" = yes ; then
- def_sdl='#define HAVE_SDL 1'
+ def_sdl='#define HAVE_SDL1 1'
novomodules="sdl $novomodules"
aomodules="sdl $aomodules"
else
- def_sdl='#define HAVE_SDL 0'
+ def_sdl='#define HAVE_SDL1 0'
novomodules="sdl $novomodules"
noaomodules="sdl $noaomodules"
fi