encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

made the wasapi configury option consistent with others.

This commit is contained in:
Ozkan Sezer 2018-07-01 19:50:00 +03:00
parent 8857791627
commit 507e271b3e
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -866,7 +866,7 @@ enable_input_tslib
enable_pthreads enable_pthreads
enable_pthread_sem enable_pthread_sem
enable_directx enable_directx
enable_audio_wasapi enable_wasapi
enable_sdl_dlopen enable_sdl_dlopen
enable_clock_gettime enable_clock_gettime
enable_rpath enable_rpath
@ -1621,7 +1621,7 @@ Optional Features:
[[default=yes]] [[default=yes]]
--enable-pthread-sem use pthread semaphores [[default=yes]] --enable-pthread-sem use pthread semaphores [[default=yes]]
--enable-directx use DirectX for Windows audio/video [[default=yes]] --enable-directx use DirectX for Windows audio/video [[default=yes]]
--enable-audio-wasapi use the Windows WASAPI audio driver [[default=yes]] --enable-wasapi use the Windows WASAPI audio driver [[default=yes]]
--enable-sdl-dlopen use dlopen for shared object loading [[default=yes]] --enable-sdl-dlopen use dlopen for shared object loading [[default=yes]]
--enable-clock_gettime use clock_gettime() instead of gettimeofday() on --enable-clock_gettime use clock_gettime() instead of gettimeofday() on
UNIX [[default=yes]] UNIX [[default=yes]]
@ -23233,11 +23233,11 @@ $as_echo "#define HAVE_XINPUT_STATE_EX 1" >>confdefs.h
SUMMARY_video="${SUMMARY_video} directx" SUMMARY_video="${SUMMARY_video} directx"
SUMMARY_audio="${SUMMARY_audio} directx" SUMMARY_audio="${SUMMARY_audio} directx"
# Check whether --enable-audio-wasapi was given. # Check whether --enable-wasapi was given.
if test "${enable_audio_wasapi+set}" = set; then : if test "${enable_wasapi+set}" = set; then :
enableval=$enable_audio_wasapi; enableval=$enable_wasapi;
else else
enable_audio_wasapi=yes enable_wasapi=yes
fi fi
@ -24144,7 +24144,7 @@ $as_echo "#define SDL_AUDIO_DRIVER_DSOUND 1" >>confdefs.h
SOURCES="$SOURCES $srcdir/src/audio/directsound/*.c" SOURCES="$SOURCES $srcdir/src/audio/directsound/*.c"
fi fi
if test x$have_wasapi = xyes -a x$enable_audio_wasapi = xyes; then if test x$have_wasapi = xyes -a x$enable_wasapi = xyes; then
$as_echo "#define SDL_AUDIO_DRIVER_WASAPI 1" >>confdefs.h $as_echo "#define SDL_AUDIO_DRIVER_WASAPI 1" >>confdefs.h

8
configure.in
View File

@ -3079,9 +3079,9 @@ XINPUT_STATE_EX s1;
SUMMARY_video="${SUMMARY_video} directx" SUMMARY_video="${SUMMARY_video} directx"
SUMMARY_audio="${SUMMARY_audio} directx" SUMMARY_audio="${SUMMARY_audio} directx"
AC_ARG_ENABLE(audio-wasapi, AC_ARG_ENABLE(wasapi,
AC_HELP_STRING([--enable-audio-wasapi], [use the Windows WASAPI audio driver [[default=yes]]]), AC_HELP_STRING([--enable-wasapi], [use the Windows WASAPI audio driver [[default=yes]]]),
, enable_audio_wasapi=yes) , enable_wasapi=yes)
# FIXME: latest Cygwin finds dinput headers, but we die on other win32 headers. # FIXME: latest Cygwin finds dinput headers, but we die on other win32 headers.
# FIXME: ...so force it off for now. # FIXME: ...so force it off for now.
@ -3551,7 +3551,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND, 1, [ ]) AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND, 1, [ ])
SOURCES="$SOURCES $srcdir/src/audio/directsound/*.c" SOURCES="$SOURCES $srcdir/src/audio/directsound/*.c"
fi fi
if test x$have_wasapi = xyes -a x$enable_audio_wasapi = xyes; then if test x$have_wasapi = xyes -a x$enable_wasapi = xyes; then
AC_DEFINE(SDL_AUDIO_DRIVER_WASAPI, 1, [ ]) AC_DEFINE(SDL_AUDIO_DRIVER_WASAPI, 1, [ ])
SUMMARY_audio="${SUMMARY_audio} wasapi" SUMMARY_audio="${SUMMARY_audio} wasapi"
SOURCES="$SOURCES $srcdir/src/audio/wasapi/*.c" SOURCES="$SOURCES $srcdir/src/audio/wasapi/*.c"