diff options
author | wm4 <wm4@nowhere> | 2018-02-12 18:02:35 +0100 |
---|---|---|
committer | Kevin Mitchell <kevmitch@gmail.com> | 2018-02-13 17:45:29 -0800 |
commit | 1dcf511376545de7624863b76d7f30dc3bb44ac9 (patch) | |
tree | 565566201e57bd0979925a11449a33e73fa767c8 | |
parent | 02f9087de9103784a236f50d4b0990069ae9cf1e (diff) | |
download | mpv-1dcf511376545de7624863b76d7f30dc3bb44ac9.tar.bz2 mpv-1dcf511376545de7624863b76d7f30dc3bb44ac9.tar.xz |
build: drop support for SDL1
For some reason it was supported for ao_sdl because we've only used SDL1
API.
-rw-r--r-- | audio/out/ao.c | 2 | ||||
-rw-r--r-- | wscript | 6 | ||||
-rw-r--r-- | wscript_build.py | 1 |
3 files changed, 1 insertions, 8 deletions
diff --git a/audio/out/ao.c b/audio/out/ao.c index 0acd439033..5834345d59 100644 --- a/audio/out/ao.c +++ b/audio/out/ao.c @@ -82,7 +82,7 @@ static const struct ao_driver * const audio_out_drivers[] = { #if HAVE_OPENSLES &audio_out_opensles, #endif -#if HAVE_SDL1 || HAVE_SDL2 +#if HAVE_SDL2 &audio_out_sdl, #endif #if HAVE_SNDIO @@ -482,12 +482,6 @@ audio_output_features = [ 'func': check_pkg_config('sdl2'), 'default': 'disable' }, { - 'name': '--sdl1', - 'desc': 'SDL (1.x)', - 'deps': '!sdl2', - 'func': check_pkg_config('sdl'), - 'default': 'disable' - }, { 'name': '--oss-audio', 'desc': 'OSS', 'func': check_cc(header_name='sys/soundcard.h'), diff --git a/wscript_build.py b/wscript_build.py index 78db131beb..efd9dc8424 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -240,7 +240,6 @@ def build(ctx): ( "audio/out/ao_pcm.c" ), ( "audio/out/ao_pulse.c", "pulse" ), ( "audio/out/ao_rsound.c", "rsound" ), - ( "audio/out/ao_sdl.c", "sdl1" ), ( "audio/out/ao_sdl.c", "sdl2" ), ( "audio/out/ao_sndio.c", "sndio" ), ( "audio/out/ao_wasapi.c", "wasapi" ), |