From 507e271b3ef45d1be6e6d740f14453361acfa761 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Sun, 1 Jul 2018 19:50:00 +0300 Subject: [PATCH] made the wasapi configury option consistent with others. --- configure | 14 +++++++------- configure.in | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configure b/configure index a6e8d9b99e164..8a0d73b0c0100 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 d508f36a11687..e6f4b7d6e94f5 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"