diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 54 |
1 files changed, 49 insertions, 5 deletions
@@ -369,7 +369,8 @@ 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-dsound disable DirectSound audio output [autodetect] + --disable-wasapi0 disable WASAPI (event mode) audio output [autodetect] --disable-select disable using select() on the audio device [enable] Localization options: @@ -428,6 +429,7 @@ _direct3d=auto _sdl=no _sdl2=no _dsound=auto +_wasapi0=auto _mng=auto _jpeg=auto _gl=auto @@ -496,7 +498,6 @@ _stream_cache=yes _priority=no def_dos_paths="#define HAVE_DOS_PATHS 0" def_priority="#undef CONFIG_PRIORITY" -need_shmem=yes _build_man=auto for ac_option do case "$ac_option" in @@ -597,6 +598,8 @@ for ac_option do --disable-sdl2) _sdl2=no ;; --enable-dsound) _dsound=yes ;; --disable-dsound) _dsound=no ;; + --enable-waspi0) _waspi0=yes ;; + --disable-waspi0) _waspi0=no ;; --enable-mng) _mng=yes ;; --disable-mng) _mng=no ;; --enable-jpeg) _jpeg=yes ;; @@ -886,7 +889,7 @@ fi if win32 ; then _exesuf=".exe" - extra_cflags="$extra_cflags -fno-common -DWINVER=0x0500" + extra_cflags="$extra_cflags -fno-common" # -lwinmm is always needed for osdep/timer-win2.c libs_mplayer="$libs_mplayer -lwinmm" _pe_executable=yes @@ -898,7 +901,6 @@ fi if mingw32 ; then _getch=getch2-win.c - need_shmem=no extra_cflags="$extra_cflags -D__USE_MINGW_ANSI_STDIO=1" # Hack for missing BYTE_ORDER declarations in <sys/types.h>. # (For some reason, they are in <sys/param.h>, but we don't bother switching @@ -1760,6 +1762,7 @@ EOF fi if test "$_cocoa" = yes ; then libs_mplayer="$libs_mplayer -framework IOKit -framework Cocoa -framework OpenGL" + extra_ldflags="$extra_ldflags -fobjc-arc" # needed for OS X 10.7 def_cocoa='#define CONFIG_COCOA 1' else def_cocoa='#undef CONFIG_COCOA' @@ -2214,6 +2217,46 @@ else fi echores "$_dsound" +echocheck "WASAPI" +if test "$_wasapi0" = auto ; then + _wasapi0=no + +cat > $TMPC << EOF +#define COBJMACROS 1 +#define _WIN32_WINNT 0x600 +#include <malloc.h> +#include <stdlib.h> +#include <process.h> +#include <initguid.h> +#include <audioclient.h> +#include <endpointvolume.h> +#include <mmdeviceapi.h> +#include <avrt.h> + const GUID *check1[] = { + &IID_IAudioClient, + &IID_IAudioRenderClient, + &IID_IAudioClient, + &IID_IAudioEndpointVolume, + }; +int main(void) { + return 0; +} +EOF + +if cc_check "-lole32 -lavrt"; then + _wasapi0="yes" +fi + +fi +if test "$_wasapi0" = yes ; then + def_wasapi0='#define CONFIG_WASAPI0 1' + aomodules="wasap0 $aomodules" + libs_mplayer="$libs_mplayer -lole32 -lavrt" +else + def_wasapi0='#undef CONFIG_WASAPI0' + noaomodules="wasaip0 $noaomodules" +fi +echores "$_wasapi0" fi #if win32; then @@ -3103,7 +3146,6 @@ $(mak_enable "$arch_all" "$arch" ARCH) $(mak_enable "$subarch_all" "$subarch" ARCH) NEED_GLOB = $need_glob -NEED_SHMEM = $need_shmem # features ALSA = $_alsa @@ -3118,6 +3160,7 @@ DIRECT3D = $_direct3d SDL = $_sdl SDL2 = $_sdl2 DSOUND = $_dsound +WASAPI0 = $_wasapi0 DVBIN = $_dvbin DVDREAD = $_dvdread DXR3 = $_dxr3 @@ -3361,6 +3404,7 @@ $def_direct3d $def_sdl $def_sdl2 $def_dsound +$def_wasapi0 $def_dvb $def_dvbin $def_gl |