RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

build: isolate sdl-to-sdl2 aliasing 

This simplifies incoming SDL related changes by removing potential
mismatching states of sdl and sdl2 variables. Since a component can have
all kind of states (such as unset, enabled, disabled or requested),
keeping these variables in sync manually in random places is not robust.
This commit is contained in:
Clément Bœsch 2017-08-30 13:12:14 +02:00 committed by Clément Bœsch
parent 72655616d9
commit 778fa6350e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@ -1488,7 +1488,6 @@ EXTERNAL_AUTODETECT_LIBRARY_LIST="
libxcb_xfixes libxcb_xfixes
lzma lzma
schannel schannel
sdl
sdl2 sdl2
securetransport securetransport
xlib xlib
@ -3524,6 +3523,9 @@ for opt do
action=${opt%%-random=*} action=${opt%%-random=*}
do_random ${action#--} $optval do_random ${action#--} $optval
;; ;;
--enable-sdl)
enable sdl2
;;
--enable-*=*|--disable-*=*) --enable-*=*|--disable-*=*)
eval $(echo "${opt%%=*}" | sed 's/--/action=/;s/-/ thing=/') eval $(echo "${opt%%=*}" | sed 's/--/action=/;s/-/ thing=/')
is_in "${thing}s" $COMPONENT_LIST || die_unknown "$opt" is_in "${thing}s" $COMPONENT_LIST || die_unknown "$opt"
@ -6025,7 +6027,6 @@ if enabled gcrypt; then
fi fi
fi fi
disabled sdl && disable sdl2
if ! disabled sdl2; then if ! disabled sdl2; then
SDL2_CONFIG="${cross_prefix}sdl2-config" SDL2_CONFIG="${cross_prefix}sdl2-config"
if check_pkg_config sdl2 SDL_events.h SDL_PollEvent; then if check_pkg_config sdl2 SDL_events.h SDL_PollEvent; then
@ -6045,7 +6046,7 @@ if ! disabled sdl2; then
sdl2_extralibs="$sdl2_extralibs -mconsole" sdl2_extralibs="$sdl2_extralibs -mconsole"
fi fi
fi fi
enabled sdl2 && enable sdl && add_cflags $sdl2_cflags && add_extralibs $sdl2_extralibs enabled sdl2 && add_cflags $sdl2_cflags && add_extralibs $sdl2_extralibs
if enabled decklink; then if enabled decklink; then
case $target_os in case $target_os in