Added detection of Open Sound System on Solaris x86
authorSam Lantinga <slouken@lokigames.com>
Wed, 23 May 2001 00:36:17 +0000
changeset 35d3bc792e136d
parent 34 27cb016592f9
child 36 13ee9f4834ea
Added detection of Open Sound System on Solaris x86
configure.in
docs.html
src/audio/SDL_audio.c
src/audio/SDL_sysaudio.h
src/audio/dma/SDL_dmaaudio.c
src/audio/dsp/SDL_dspaudio.c
     1.1 --- a/configure.in	Wed May 23 00:06:08 2001 +0000
     1.2 +++ b/configure.in	Wed May 23 00:36:17 2001 +0000
     1.3 @@ -242,21 +242,7 @@
     1.4          AC_MSG_CHECKING(for OSS audio support)
     1.5          have_oss=no
     1.6          AC_TRY_COMPILE([
     1.7 -          #ifdef linux
     1.8 -          #include <linux/soundcard.h>
     1.9 -          #endif
    1.10 -          #ifdef __FreeBSD__
    1.11 -          #include <machine/soundcard.h>
    1.12 -          #endif
    1.13 -          #ifdef __bsdi__
    1.14            #include <sys/soundcard.h>
    1.15 -          #endif
    1.16 -          #ifdef __OpenBSD__
    1.17 -          #include <soundcard.h>
    1.18 -          #endif
    1.19 -          #ifdef __USLC__
    1.20 -          #include <sys/soundcard.h>
    1.21 -          #endif
    1.22          ],[
    1.23  	  int arg = SNDCTL_DSP_SETFRAGMENT;
    1.24          ],[
    1.25 @@ -1146,6 +1132,8 @@
    1.26          CheckDummyVideo
    1.27          CheckNASM
    1.28          CheckOSS
    1.29 +        CheckARTSC
    1.30 +        CheckESD
    1.31          CheckNAS
    1.32          CheckX11
    1.33          CheckDGA
    1.34 @@ -1386,6 +1374,7 @@
    1.35          CFLAGS="$CFLAGS -D__ELF__" # Fix for nasm on Solaris x86
    1.36          CheckDummyVideo
    1.37          CheckNASM
    1.38 +        CheckOSS
    1.39          CheckARTSC
    1.40          CheckESD
    1.41          CheckNAS
    1.42 @@ -1488,6 +1477,7 @@
    1.43      *-*-hpux*)
    1.44          ARCH=hpux
    1.45          CheckDummyVideo
    1.46 +        CheckOSS
    1.47          CheckNAS
    1.48          CheckX11
    1.49          CheckGGI
    1.50 @@ -1531,6 +1521,7 @@
    1.51      *-*-aix*)
    1.52          ARCH=aix
    1.53          CheckDummyVideo
    1.54 +        CheckOSS
    1.55          CheckNAS
    1.56          CheckX11
    1.57          CheckGGI
     2.1 --- a/docs.html	Wed May 23 00:06:08 2001 +0000
     2.2 +++ b/docs.html	Wed May 23 00:36:17 2001 +0000
     2.3 @@ -16,6 +16,7 @@
     2.4  Major changes since SDL 1.0.0:
     2.5  </H2>
     2.6  <UL>
     2.7 +	<LI> 1.2.1: Added detection of Open Sound System on Solaris x86
     2.8  	<LI> 1.2.1: Added initial support for Nano-X (thanks Hsieh-Fu!)
     2.9  	<LI> 1.2.1: Fixed endian detection on IA64 architectures (thanks Bill!)
    2.10  	<LI> 1.2.1: Added --disable-dga configure option to disable DGA
     3.1 --- a/src/audio/SDL_audio.c	Wed May 23 00:06:08 2001 +0000
     3.2 +++ b/src/audio/SDL_audio.c	Wed May 23 00:36:17 2001 +0000
     3.3 @@ -40,11 +40,6 @@
     3.4  
     3.5  /* Available audio drivers */
     3.6  static AudioBootStrap *bootstrap[] = {
     3.7 -#if defined(unix) && \
     3.8 -   !defined(linux) && !defined(__FreeBSD__) && !defined(__CYGWIN32__) \
     3.9 -   && !defined(__bsdi__)
    3.10 -	&AUDIO_bootstrap,
    3.11 -#endif
    3.12  #ifdef OSS_SUPPORT
    3.13  	&DSP_bootstrap,
    3.14  	&DMA_bootstrap,
    3.15 @@ -52,6 +47,10 @@
    3.16  #ifdef ALSA_SUPPORT
    3.17  	&ALSA_bootstrap,
    3.18  #endif
    3.19 +#if (defined(unix) && !defined(__CYGWIN32__)) && \
    3.20 +    !defined(OSS_SUPPORT) && !defined(ALSA_SUPPORT)
    3.21 +	&AUDIO_bootstrap,
    3.22 +#endif
    3.23  #ifdef ARTSC_SUPPORT
    3.24  	&ARTSC_bootstrap,
    3.25  #endif
     4.1 --- a/src/audio/SDL_sysaudio.h	Wed May 23 00:06:08 2001 +0000
     4.2 +++ b/src/audio/SDL_sysaudio.h	Wed May 23 00:36:17 2001 +0000
     4.3 @@ -99,11 +99,6 @@
     4.4  	SDL_AudioDevice *(*create)(int devindex);
     4.5  } AudioBootStrap;
     4.6  
     4.7 -#if defined(unix) && \
     4.8 -   !defined(linux) && !defined(__FreeBSD__) && !defined(__CYGWIN32__) \
     4.9 -   && !defined(__bsdi__)
    4.10 -extern AudioBootStrap AUDIO_bootstrap;
    4.11 -#endif
    4.12  #ifdef OSS_SUPPORT
    4.13  extern AudioBootStrap DSP_bootstrap;
    4.14  extern AudioBootStrap DMA_bootstrap;
    4.15 @@ -111,6 +106,10 @@
    4.16  #ifdef ALSA_SUPPORT
    4.17  extern AudioBootStrap ALSA_bootstrap;
    4.18  #endif
    4.19 +#if (defined(unix) && !defined(__CYGWIN32__)) && \
    4.20 +    !defined(OSS_SUPPORT) && !defined(ALSA_SUPPORT)
    4.21 +extern AudioBootStrap AUDIO_bootstrap;
    4.22 +#endif
    4.23  #ifdef ARTSC_SUPPORT
    4.24  extern AudioBootStrap ARTSC_bootstrap;
    4.25  #endif
     5.1 --- a/src/audio/dma/SDL_dmaaudio.c	Wed May 23 00:06:08 2001 +0000
     5.2 +++ b/src/audio/dma/SDL_dmaaudio.c	Wed May 23 00:36:17 2001 +0000
     5.3 @@ -39,21 +39,7 @@
     5.4  #include <sys/ioctl.h>
     5.5  #include <sys/stat.h>
     5.6  #include <sys/mman.h>
     5.7 -#ifdef linux
     5.8 -#include <linux/soundcard.h>
     5.9 -#endif
    5.10 -#ifdef __bsdi__
    5.11  #include <sys/soundcard.h>
    5.12 -#endif
    5.13 -#ifdef __FreeBSD__
    5.14 -#include <machine/soundcard.h>
    5.15 -#endif
    5.16 -#ifdef __OpenBSD__
    5.17 -#include <soundcard.h>
    5.18 -#endif
    5.19 -#ifdef __USLC__
    5.20 -#include <sys/soundcard.h>
    5.21 -#endif
    5.22  
    5.23  #ifndef MAP_FAILED
    5.24  #define MAP_FAILED	((Uint8 *)-1)
     6.1 --- a/src/audio/dsp/SDL_dspaudio.c	Wed May 23 00:06:08 2001 +0000
     6.2 +++ b/src/audio/dsp/SDL_dspaudio.c	Wed May 23 00:36:17 2001 +0000
     6.3 @@ -37,21 +37,7 @@
     6.4  #include <sys/time.h>
     6.5  #include <sys/ioctl.h>
     6.6  #include <sys/stat.h>
     6.7 -#ifdef linux
     6.8 -#include <linux/soundcard.h>
     6.9 -#endif
    6.10 -#ifdef __bsdi__
    6.11  #include <sys/soundcard.h>
    6.12 -#endif
    6.13 -#ifdef __FreeBSD__
    6.14 -#include <machine/soundcard.h>
    6.15 -#endif
    6.16 -#ifdef __OpenBSD__
    6.17 -#include <soundcard.h>
    6.18 -#endif
    6.19 -#ifdef __USLC__
    6.20 -#include <sys/soundcard.h>
    6.21 -#endif
    6.22  
    6.23  #include "SDL_audio.h"
    6.24  #include "SDL_error.h"