diff options
| author | wm4 <wm4@nowhere> | 2012-10-05 15:17:16 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-05 15:26:31 +0200 |
| commit | abc0ab8f618afe9474d580c3d7f496e487c0e32d (patch) | |
| tree | d1c39ed17931e62ac7f3f917de34f1659e03a855 /configure | |
| parent | bc97dab8860077834d3e0939cf97726366d7d4f5 (diff) | |
| download | mpv-abc0ab8f618afe9474d580c3d7f496e487c0e32d.tar.bz2 mpv-abc0ab8f618afe9474d580c3d7f496e487c0e32d.tar.xz | |
build: fix ao_dsound config checks
ao_dsound.c depended on the same configure check as vo_directx.c, which
was removed in commit 0e2c48a3ce19. This accidentally disabled
inclusion of ao_dsound.
Fix it by adding a new check. Also, move it below ao_portaudio on the
auto-select list, as ao_dsound is considered deprecated.
Unrelated to that, move ao_lavc below ao_null to prevent it from being
auto-selected.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 23 |
1 files changed, 23 insertions, 0 deletions
@@ -375,6 +375,7 @@ Audio output: --disable-jack disable JACK audio output [autodetect] --enable-openal enable OpenAL audio output [disable] --disable-coreaudio disable CoreAudio audio output [autodetect] + --disable-dsound disable DirectSound audio output [autodetect] --disable-select disable using select() on the audio device [enable] Language options: @@ -443,6 +444,7 @@ _xss=auto _xv=auto _vdpau=auto _direct3d=auto +_dsound=auto _nas=auto _png=auto _mng=auto @@ -635,6 +637,8 @@ for ac_option do --disable-vdpau) _vdpau=no ;; --enable-direct3d) _direct3d=yes ;; --disable-direct3d) _direct3d=no ;; + --enable-dsound) _dsound=yes ;; + --disable-dsound) _dsound=no ;; --enable-png) _png=yes ;; --disable-png) _png=no ;; --enable-mng) _mng=yes ;; @@ -2478,6 +2482,7 @@ echores "$_gl" if win32; then + echocheck "Direct3D" if test "$_direct3d" = auto ; then _direct3d=no @@ -2492,6 +2497,22 @@ else fi echores "$_direct3d" + +echocheck "DirectSound" +if test "$_dsound" = auto ; then + _dsound=no + header_check dsound.h && _dsound=yes +fi +if test "$_dsound" = yes ; then + def_dsound='#define CONFIG_DSOUND 1' + aomodules="dsound $aomodules" +else + def_dsound='#undef CONFIG_DSOUND' + noaomodules="dsound $noaomodules" +fi +echores "$_dsound" + + fi #if win32; then @@ -3339,6 +3360,7 @@ COCOA = $_cocoa COREAUDIO = $_coreaudio COREVIDEO = $_corevideo DIRECT3D = $_direct3d +DSOUND = $_dsound DVBIN = $_dvbin DVDREAD = $_dvdread DXR3 = $_dxr3 @@ -3583,6 +3605,7 @@ $def_caca $def_corevideo $def_cocoa $def_direct3d +$def_dsound $def_dvb $def_dvbin $def_gif |