Skip to content

Commit

Permalink
made the wasapi configury option consistent with others.
Browse files Browse the repository at this point in the history
  • Loading branch information
sezero committed Jul 1, 2018
1 parent 8857791 commit 507e271
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
14 changes: 7 additions & 7 deletions configure
Expand Up @@ -866,7 +866,7 @@ enable_input_tslib
enable_pthreads
enable_pthread_sem
enable_directx
enable_audio_wasapi
enable_wasapi
enable_sdl_dlopen
enable_clock_gettime
enable_rpath
Expand Down Expand Up @@ -1621,7 +1621,7 @@ Optional Features:
[[default=yes]]
--enable-pthread-sem use pthread semaphores [[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-clock_gettime use clock_gettime() instead of gettimeofday() on
UNIX [[default=yes]]
Expand Down Expand Up @@ -23233,11 +23233,11 @@ $as_echo "#define HAVE_XINPUT_STATE_EX 1" >>confdefs.h
SUMMARY_video="${SUMMARY_video} directx"
SUMMARY_audio="${SUMMARY_audio} directx"

# Check whether --enable-audio-wasapi was given.
if test "${enable_audio_wasapi+set}" = set; then :
enableval=$enable_audio_wasapi;
# Check whether --enable-wasapi was given.
if test "${enable_wasapi+set}" = set; then :
enableval=$enable_wasapi;
else
enable_audio_wasapi=yes
enable_wasapi=yes
fi


Expand Down Expand Up @@ -24144,7 +24144,7 @@ $as_echo "#define SDL_AUDIO_DRIVER_DSOUND 1" >>confdefs.h

SOURCES="$SOURCES $srcdir/src/audio/directsound/*.c"
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

Expand Down
8 changes: 4 additions & 4 deletions configure.in
Expand Up @@ -3079,9 +3079,9 @@ XINPUT_STATE_EX s1;
SUMMARY_video="${SUMMARY_video} directx"
SUMMARY_audio="${SUMMARY_audio} directx"

AC_ARG_ENABLE(audio-wasapi,
AC_HELP_STRING([--enable-audio-wasapi], [use the Windows WASAPI audio driver [[default=yes]]]),
, enable_audio_wasapi=yes)
AC_ARG_ENABLE(wasapi,
AC_HELP_STRING([--enable-wasapi], [use the Windows WASAPI audio driver [[default=yes]]]),
, enable_wasapi=yes)

# FIXME: latest Cygwin finds dinput headers, but we die on other win32 headers.
# FIXME: ...so force it off for now.
Expand Down Expand Up @@ -3551,7 +3551,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND, 1, [ ])
SOURCES="$SOURCES $srcdir/src/audio/directsound/*.c"
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, [ ])
SUMMARY_audio="${SUMMARY_audio} wasapi"
SOURCES="$SOURCES $srcdir/src/audio/wasapi/*.c"
Expand Down

0 comments on commit 507e271

Please sign in to comment.