Mercurial > sdl-ios-xcode
changeset 2070:dbfa1ebd73b0
Fixed building of Windows waveout audio.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Sat, 11 Nov 2006 06:48:57 +0000 |
| parents | 8d4c2498bb72 |
| children | 579abbb51f80 |
| files | configure.in include/SDL_config.h.in include/SDL_config_win32.h src/audio/SDL_audio.c |
| diffstat | 4 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Tue Nov 07 15:18:42 2006 +0000 +++ b/configure.in Sat Nov 11 06:48:57 2006 +0000 @@ -2178,7 +2178,7 @@ fi # Set up files for the audio library 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" if test x$have_dsound = xyes; then AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND)
--- a/include/SDL_config.h.in Tue Nov 07 15:18:42 2006 +0000 +++ b/include/SDL_config.h.in Sat Nov 11 06:48:57 2006 +0000 @@ -174,7 +174,7 @@ #undef SDL_AUDIO_DRIVER_QNXNTO #undef SDL_AUDIO_DRIVER_SNDMGR #undef SDL_AUDIO_DRIVER_SUNAUDIO -#undef SDL_AUDIO_DRIVER_WAVEOUT +#undef SDL_AUDIO_DRIVER_WINWAVEOUT /* Enable various cdrom drivers */ #undef SDL_CDROM_AIX
--- a/include/SDL_config_win32.h Tue Nov 07 15:18:42 2006 +0000 +++ b/include/SDL_config_win32.h Sat Nov 11 06:48:57 2006 +0000 @@ -118,7 +118,7 @@ #ifndef _WIN32_WCE #define SDL_AUDIO_DRIVER_DSOUND 1 #endif -#define SDL_AUDIO_DRIVER_WAVEOUT 1 +#define SDL_AUDIO_DRIVER_WINWAVEOUT 1 #define SDL_AUDIO_DRIVER_DISK 1 #define SDL_AUDIO_DRIVER_DUMMY 1
--- a/src/audio/SDL_audio.c Tue Nov 07 15:18:42 2006 +0000 +++ b/src/audio/SDL_audio.c Sat Nov 11 06:48:57 2006 +0000 @@ -54,7 +54,7 @@ extern AudioBootStrap ESD_bootstrap; extern AudioBootStrap NAS_bootstrap; extern AudioBootStrap DSOUND_bootstrap; -extern AudioBootStrap WAVEOUT_bootstrap; +extern AudioBootStrap WINWAVEOUT_bootstrap; extern AudioBootStrap PAUDIO_bootstrap; extern AudioBootStrap BEOSAUDIO_bootstrap; extern AudioBootStrap COREAUDIO_bootstrap; @@ -104,8 +104,8 @@ #if SDL_AUDIO_DRIVER_DSOUND &DSOUND_bootstrap, #endif -#if SDL_AUDIO_DRIVER_WAVEOUT - &WAVEOUT_bootstrap, +#if SDL_AUDIO_DRIVER_WINWAVEOUT + &WINWAVEOUT_bootstrap, #endif #if SDL_AUDIO_DRIVER_PAUDIO &PAUDIO_bootstrap,