pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed building of Windows waveout audio.

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402228
This commit is contained in:
Ryan C. Gordon 2006-11-11 06:48:57 +00:00
parent 797faa052f
commit 2a14d5cdca
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.in
View file

@ -2178,7 +2178,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
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_WAVEOUT) AC_DEFINE(SDL_AUDIO_DRIVER_WINWAVEOUT)
SOURCES="$SOURCES $srcdir/src/audio/windib/*.c" SOURCES="$SOURCES $srcdir/src/audio/windib/*.c"
if test x$have_dsound = xyes; then if test x$have_dsound = xyes; then
AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND) AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND)

2
include/SDL_config.h.in
View file

@ -174,7 +174,7 @@
#undef SDL_AUDIO_DRIVER_QNXNTO #undef SDL_AUDIO_DRIVER_QNXNTO
#undef SDL_AUDIO_DRIVER_SNDMGR #undef SDL_AUDIO_DRIVER_SNDMGR
#undef SDL_AUDIO_DRIVER_SUNAUDIO #undef SDL_AUDIO_DRIVER_SUNAUDIO
#undef SDL_AUDIO_DRIVER_WAVEOUT #undef SDL_AUDIO_DRIVER_WINWAVEOUT
/* Enable various cdrom drivers */ /* Enable various cdrom drivers */
#undef SDL_CDROM_AIX #undef SDL_CDROM_AIX

2
include/SDL_config_win32.h
View file

@ -118,7 +118,7 @@ typedef unsigned int uintptr_t;
#ifndef _WIN32_WCE #ifndef _WIN32_WCE
#define SDL_AUDIO_DRIVER_DSOUND 1 #define SDL_AUDIO_DRIVER_DSOUND 1
#endif #endif
#define SDL_AUDIO_DRIVER_WAVEOUT 1 #define SDL_AUDIO_DRIVER_WINWAVEOUT 1
#define SDL_AUDIO_DRIVER_DISK 1 #define SDL_AUDIO_DRIVER_DISK 1
#define SDL_AUDIO_DRIVER_DUMMY 1 #define SDL_AUDIO_DRIVER_DUMMY 1

6
src/audio/SDL_audio.c
View file

@ -54,7 +54,7 @@ extern AudioBootStrap ARTS_bootstrap;
extern AudioBootStrap ESD_bootstrap; extern AudioBootStrap ESD_bootstrap;
extern AudioBootStrap NAS_bootstrap; extern AudioBootStrap NAS_bootstrap;
extern AudioBootStrap DSOUND_bootstrap; extern AudioBootStrap DSOUND_bootstrap;
extern AudioBootStrap WAVEOUT_bootstrap; extern AudioBootStrap WINWAVEOUT_bootstrap;
extern AudioBootStrap PAUDIO_bootstrap; extern AudioBootStrap PAUDIO_bootstrap;
extern AudioBootStrap BEOSAUDIO_bootstrap; extern AudioBootStrap BEOSAUDIO_bootstrap;
extern AudioBootStrap COREAUDIO_bootstrap; extern AudioBootStrap COREAUDIO_bootstrap;
@ -104,8 +104,8 @@ static AudioBootStrap *bootstrap[] = {
#if SDL_AUDIO_DRIVER_DSOUND #if SDL_AUDIO_DRIVER_DSOUND
&DSOUND_bootstrap, &DSOUND_bootstrap,
#endif #endif
#if SDL_AUDIO_DRIVER_WAVEOUT #if SDL_AUDIO_DRIVER_WINWAVEOUT
&WAVEOUT_bootstrap, &WINWAVEOUT_bootstrap,
#endif #endif
#if SDL_AUDIO_DRIVER_PAUDIO #if SDL_AUDIO_DRIVER_PAUDIO
&PAUDIO_bootstrap, &PAUDIO_bootstrap,