Fixed building of Windows waveout audio.
authorRyan C. Gordon <icculus@icculus.org>
Sat, 11 Nov 2006 06:48:57 +0000
changeset 2070dbfa1ebd73b0
parent 2069 8d4c2498bb72
child 2071 579abbb51f80
Fixed building of Windows waveout audio.
configure.in
include/SDL_config.h.in
include/SDL_config_win32.h
src/audio/SDL_audio.c
     1.1 --- a/configure.in	Tue Nov 07 15:18:42 2006 +0000
     1.2 +++ b/configure.in	Sat Nov 11 06:48:57 2006 +0000
     1.3 @@ -2178,7 +2178,7 @@
     1.4          fi
     1.5          # Set up files for the audio library
     1.6          if test x$enable_audio = xyes; then
     1.7 -            AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT)
     1.8 +            AC_DEFINE(SDL_AUDIO_DRIVER_WINWAVEOUT)
     1.9              SOURCES="$SOURCES $srcdir/src/audio/windib/*.c"
    1.10              if test x$have_dsound = xyes; then
    1.11                  AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND)
     2.1 --- a/include/SDL_config.h.in	Tue Nov 07 15:18:42 2006 +0000
     2.2 +++ b/include/SDL_config.h.in	Sat Nov 11 06:48:57 2006 +0000
     2.3 @@ -174,7 +174,7 @@
     2.4  #undef SDL_AUDIO_DRIVER_QNXNTO
     2.5  #undef SDL_AUDIO_DRIVER_SNDMGR
     2.6  #undef SDL_AUDIO_DRIVER_SUNAUDIO
     2.7 -#undef SDL_AUDIO_DRIVER_WAVEOUT
     2.8 +#undef SDL_AUDIO_DRIVER_WINWAVEOUT
     2.9  
    2.10  /* Enable various cdrom drivers */
    2.11  #undef SDL_CDROM_AIX
     3.1 --- a/include/SDL_config_win32.h	Tue Nov 07 15:18:42 2006 +0000
     3.2 +++ b/include/SDL_config_win32.h	Sat Nov 11 06:48:57 2006 +0000
     3.3 @@ -118,7 +118,7 @@
     3.4  #ifndef _WIN32_WCE
     3.5  #define SDL_AUDIO_DRIVER_DSOUND	1
     3.6  #endif
     3.7 -#define SDL_AUDIO_DRIVER_WAVEOUT	1
     3.8 +#define SDL_AUDIO_DRIVER_WINWAVEOUT	1
     3.9  #define SDL_AUDIO_DRIVER_DISK	1
    3.10  #define SDL_AUDIO_DRIVER_DUMMY	1
    3.11  
     4.1 --- a/src/audio/SDL_audio.c	Tue Nov 07 15:18:42 2006 +0000
     4.2 +++ b/src/audio/SDL_audio.c	Sat Nov 11 06:48:57 2006 +0000
     4.3 @@ -54,7 +54,7 @@
     4.4  extern AudioBootStrap ESD_bootstrap;
     4.5  extern AudioBootStrap NAS_bootstrap;
     4.6  extern AudioBootStrap DSOUND_bootstrap;
     4.7 -extern AudioBootStrap WAVEOUT_bootstrap;
     4.8 +extern AudioBootStrap WINWAVEOUT_bootstrap;
     4.9  extern AudioBootStrap PAUDIO_bootstrap;
    4.10  extern AudioBootStrap BEOSAUDIO_bootstrap;
    4.11  extern AudioBootStrap COREAUDIO_bootstrap;
    4.12 @@ -104,8 +104,8 @@
    4.13  #if SDL_AUDIO_DRIVER_DSOUND
    4.14      &DSOUND_bootstrap,
    4.15  #endif
    4.16 -#if SDL_AUDIO_DRIVER_WAVEOUT
    4.17 -    &WAVEOUT_bootstrap,
    4.18 +#if SDL_AUDIO_DRIVER_WINWAVEOUT
    4.19 +    &WINWAVEOUT_bootstrap,
    4.20  #endif
    4.21  #if SDL_AUDIO_DRIVER_PAUDIO
    4.22      &PAUDIO_bootstrap,