Commit 2f6c988e7c0595ee533fae7b4fb2099909930d06
2019-04-21T21:34:14
configure: Cleaned up audio/video summaries when building for Windows.
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 74 75 76 77 78
diff --git a/configure b/configure
index fe0dfad..b484f58 100755
--- a/configure
+++ b/configure
@@ -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 45ea283..c891e07 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