RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-21 18:57:35 +00:00
Code Issues Releases Wiki Activity

build: fix usage of HAVE_SDL1 define

Browse Source 
This is needed after fd1f8ed49.
This commit is contained in:
Stefano Pigozzi 2014-01-25 09:18:07 +01:00
parent fd1f8ed490
commit 3137a1a7b5
2 changed files with 4 additions and 4 deletions

2
audio/out/ao.c
View File

@ -81,7 +81,7 @@ static const struct ao_driver * const audio_out_drivers[] = {
#if HAVE_OPENAL #if HAVE_OPENAL
&audio_out_openal, &audio_out_openal,
#endif #endif
#if HAVE_SDL || HAVE_SDL2 #if HAVE_SDL1 || HAVE_SDL2
&audio_out_sdl, &audio_out_sdl,
#endif #endif
&audio_out_null, &audio_out_null,

6
old-configure
View File

@ -2206,7 +2206,7 @@ if test "$_sdl2" = yes ; then
fi fi
if test "$_sdl2" = yes ; then if test "$_sdl2" = yes ; then
_sdl=yes # sdl2 implies sdl _sdl=yes # sdl2 implies sdl
def_sdl='#define HAVE_SDL 1' def_sdl='#define HAVE_SDL1 1'
def_sdl2='#define HAVE_SDL2 1' def_sdl2='#define HAVE_SDL2 1'
vomodules="sdl $vomodules" vomodules="sdl $vomodules"
aomodules="sdl $aomodules" aomodules="sdl $aomodules"
@ -2219,11 +2219,11 @@ else
pkg_config_add 'sdl' && _sdl=yes pkg_config_add 'sdl' && _sdl=yes
fi fi
if test "$_sdl" = yes ; then if test "$_sdl" = yes ; then
def_sdl='#define HAVE_SDL 1' def_sdl='#define HAVE_SDL1 1'
novomodules="sdl $novomodules" novomodules="sdl $novomodules"
aomodules="sdl $aomodules" aomodules="sdl $aomodules"
else else
def_sdl='#define HAVE_SDL 0' def_sdl='#define HAVE_SDL1 0'
novomodules="sdl $novomodules" novomodules="sdl $novomodules"
noaomodules="sdl $noaomodules" noaomodules="sdl $noaomodules"
fi fi