Commit 507e271b3ef45d1be6e6d740f14453361acfa761
2018-07-01T19:50:00
made the wasapi configury option consistent with others.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
diff --git a/configure b/configure
index a6e8d9b..8a0d73b 100755
--- a/configure
+++ b/configure
@@ -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
@@ -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]]
@@ -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
@@ -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
diff --git a/configure.in b/configure.in
index d508f36..e6f4b7d 100644
--- a/configure.in
+++ b/configure.in
@@ -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.
@@ -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"