encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure: Cleaned up audio/video summaries when building for Windows.

This commit is contained in:
Ryan C. Gordon 2019-04-21 21:34:14 -04:00
parent 90b08881ab
commit 2f6c988e7c
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@ -23536,9 +23536,6 @@ $as_echo "#define HAVE_XINPUT_STATE_EX 1" >>confdefs.h
fi 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: latest Cygwin finds dinput headers, but we die on other win32 headers.
# FIXME: ...so force it off for now. # FIXME: ...so force it off for now.
case "$host" in case "$host" in
@ -24616,11 +24613,13 @@ fi
$as_echo "#define SDL_VIDEO_RENDER_D3D 1" >>confdefs.h $as_echo "#define SDL_VIDEO_RENDER_D3D 1" >>confdefs.h
SUMMARY_video="${SUMMARY_video} d3d9"
fi fi
if test x$enable_render_d3d = xyes -a x$have_d3d11 = xyes; then if test x$enable_render_d3d = xyes -a x$have_d3d11 = xyes; then
$as_echo "#define SDL_VIDEO_RENDER_D3D11 1" >>confdefs.h $as_echo "#define SDL_VIDEO_RENDER_D3D11 1" >>confdefs.h
SUMMARY_video="${SUMMARY_video} d3d11"
fi fi
fi fi
# Set up files for the audio library # 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 $as_echo "#define SDL_AUDIO_DRIVER_WINMM 1" >>confdefs.h
SUMMARY_audio="${SUMMARY_audio} winmm"
SOURCES="$SOURCES $srcdir/src/audio/winmm/*.c" SOURCES="$SOURCES $srcdir/src/audio/winmm/*.c"
if test x$have_dsound = xyes; then if test x$have_dsound = xyes; then
$as_echo "#define SDL_AUDIO_DRIVER_DSOUND 1" >>confdefs.h $as_echo "#define SDL_AUDIO_DRIVER_DSOUND 1" >>confdefs.h
SUMMARY_audio="${SUMMARY_audio} directsound"
SOURCES="$SOURCES $srcdir/src/audio/directsound/*.c" SOURCES="$SOURCES $srcdir/src/audio/directsound/*.c"
fi fi
if test x$have_wasapi = xyes -a x$enable_wasapi = xyes; then if test x$have_wasapi = xyes -a x$enable_wasapi = xyes; then

7
configure.ac
View File

@ -2973,9 +2973,6 @@ XINPUT_STATE_EX s1;
AC_DEFINE(HAVE_XINPUT_STATE_EX, 1, [ ]) AC_DEFINE(HAVE_XINPUT_STATE_EX, 1, [ ])
fi 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: latest Cygwin finds dinput headers, but we die on other win32 headers.
# FIXME: ...so force it off for now. # FIXME: ...so force it off for now.
case "$host" in case "$host" in
@ -3514,17 +3511,21 @@ AS_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
, enable_render_d3d=yes) , enable_render_d3d=yes)
if test x$enable_render_d3d = xyes -a x$have_d3d = xyes; then if test x$enable_render_d3d = xyes -a x$have_d3d = xyes; then
AC_DEFINE(SDL_VIDEO_RENDER_D3D, 1, [ ]) AC_DEFINE(SDL_VIDEO_RENDER_D3D, 1, [ ])
SUMMARY_video="${SUMMARY_video} d3d9"
fi fi
if test x$enable_render_d3d = xyes -a x$have_d3d11 = xyes; then if test x$enable_render_d3d = xyes -a x$have_d3d11 = xyes; then
AC_DEFINE(SDL_VIDEO_RENDER_D3D11, 1, [ ]) AC_DEFINE(SDL_VIDEO_RENDER_D3D11, 1, [ ])
SUMMARY_video="${SUMMARY_video} d3d11"
fi fi
fi fi
# Set up files for the audio library # Set up files for the audio library
if test x$enable_audio = xyes; then if test x$enable_audio = xyes; then
AC_DEFINE(SDL_AUDIO_DRIVER_WINMM, 1, [ ]) AC_DEFINE(SDL_AUDIO_DRIVER_WINMM, 1, [ ])
SUMMARY_audio="${SUMMARY_audio} winmm"
SOURCES="$SOURCES $srcdir/src/audio/winmm/*.c" SOURCES="$SOURCES $srcdir/src/audio/winmm/*.c"
if test x$have_dsound = xyes; then if test x$have_dsound = xyes; then
AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND, 1, [ ]) AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND, 1, [ ])
SUMMARY_audio="${SUMMARY_audio} directsound"
SOURCES="$SOURCES $srcdir/src/audio/directsound/*.c" SOURCES="$SOURCES $srcdir/src/audio/directsound/*.c"
fi fi
if test x$have_wasapi = xyes -a x$enable_wasapi = xyes; then if test x$have_wasapi = xyes -a x$enable_wasapi = xyes; then