diff options
| author | Ryan C. Gordon <icculus@icculus.org> | 2019-04-21 21:34:14 -0400 |
|---|---|---|
| committer | Ryan C. Gordon <icculus@icculus.org> | 2019-04-21 21:34:14 -0400 |
| commit | 47460e7adf4d09d28f77b20c16616bc7f7bb1f66 (patch) | |
| tree | 796acf23ab4c35eb452243f1187bcc7380607324 | |
| parent | f54cddf8952802fa94f359d21c6da46979e10ce0 (diff) | |
configure: Cleaned up audio/video summaries when building for Windows.
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 8 insertions, 6 deletions
@@ -23536,9 +23536,6 @@ $as_echo "#define HAVE_XINPUT_STATE_EX 1" >>confdefs.h fi - SUMMARY_video="${SUMMARY_video} directx" - SUMMARY_audio="${SUMMARY_audio} directx" - # FIXME: latest Cygwin finds dinput headers, but we die on other win32 headers. # FIXME: ...so force it off for now. case "$host" in @@ -24616,11 +24613,13 @@ fi $as_echo "#define SDL_VIDEO_RENDER_D3D 1" >>confdefs.h + SUMMARY_video="${SUMMARY_video} d3d9" fi if test x$enable_render_d3d = xyes -a x$have_d3d11 = xyes; then $as_echo "#define SDL_VIDEO_RENDER_D3D11 1" >>confdefs.h + SUMMARY_video="${SUMMARY_video} d3d11" fi fi # Set up files for the audio library @@ -24628,11 +24627,13 @@ $as_echo "#define SDL_VIDEO_RENDER_D3D11 1" >>confdefs.h $as_echo "#define SDL_AUDIO_DRIVER_WINMM 1" >>confdefs.h + SUMMARY_audio="${SUMMARY_audio} winmm" SOURCES="$SOURCES $srcdir/src/audio/winmm/*.c" if test x$have_dsound = xyes; then $as_echo "#define SDL_AUDIO_DRIVER_DSOUND 1" >>confdefs.h + SUMMARY_audio="${SUMMARY_audio} directsound" SOURCES="$SOURCES $srcdir/src/audio/directsound/*.c" fi if test x$have_wasapi = xyes -a x$enable_wasapi = xyes; then diff --git a/configure.ac b/configure.ac index 45ea28363c..c891e07f4c 100644 --- a/configure.ac +++ b/configure.ac @@ -2973,9 +2973,6 @@ XINPUT_STATE_EX s1; AC_DEFINE(HAVE_XINPUT_STATE_EX, 1, [ ]) fi - SUMMARY_video="${SUMMARY_video} directx" - SUMMARY_audio="${SUMMARY_audio} directx" - # FIXME: latest Cygwin finds dinput headers, but we die on other win32 headers. # FIXME: ...so force it off for now. case "$host" in @@ -3514,17 +3511,21 @@ AS_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau , enable_render_d3d=yes) if test x$enable_render_d3d = xyes -a x$have_d3d = xyes; then AC_DEFINE(SDL_VIDEO_RENDER_D3D, 1, [ ]) + SUMMARY_video="${SUMMARY_video} d3d9" fi if test x$enable_render_d3d = xyes -a x$have_d3d11 = xyes; then AC_DEFINE(SDL_VIDEO_RENDER_D3D11, 1, [ ]) + SUMMARY_video="${SUMMARY_video} d3d11" fi fi # Set up files for the audio library if test x$enable_audio = xyes; then AC_DEFINE(SDL_AUDIO_DRIVER_WINMM, 1, [ ]) + SUMMARY_audio="${SUMMARY_audio} winmm" SOURCES="$SOURCES $srcdir/src/audio/winmm/*.c" if test x$have_dsound = xyes; then AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND, 1, [ ]) + SUMMARY_audio="${SUMMARY_audio} directsound" SOURCES="$SOURCES $srcdir/src/audio/directsound/*.c" fi if test x$have_wasapi = xyes -a x$enable_wasapi = xyes; then |