Mercurial > sdl-ios-xcode
changeset 35:d3bc792e136d
Added detection of Open Sound System on Solaris x86
| author | Sam Lantinga <slouken@lokigames.com> |
|---|---|
| date | Wed, 23 May 2001 00:36:17 +0000 |
| parents | 27cb016592f9 |
| children | 13ee9f4834ea |
| files | 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 |
| diffstat | 6 files changed, 14 insertions(+), 52 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Wed May 23 00:06:08 2001 +0000 +++ b/configure.in Wed May 23 00:36:17 2001 +0000 @@ -242,21 +242,7 @@ AC_MSG_CHECKING(for OSS audio support) have_oss=no AC_TRY_COMPILE([ - #ifdef linux - #include <linux/soundcard.h> - #endif - #ifdef __FreeBSD__ - #include <machine/soundcard.h> - #endif - #ifdef __bsdi__ #include <sys/soundcard.h> - #endif - #ifdef __OpenBSD__ - #include <soundcard.h> - #endif - #ifdef __USLC__ - #include <sys/soundcard.h> - #endif ],[ int arg = SNDCTL_DSP_SETFRAGMENT; ],[ @@ -1146,6 +1132,8 @@ CheckDummyVideo CheckNASM CheckOSS + CheckARTSC + CheckESD CheckNAS CheckX11 CheckDGA @@ -1386,6 +1374,7 @@ CFLAGS="$CFLAGS -D__ELF__" # Fix for nasm on Solaris x86 CheckDummyVideo CheckNASM + CheckOSS CheckARTSC CheckESD CheckNAS @@ -1488,6 +1477,7 @@ *-*-hpux*) ARCH=hpux CheckDummyVideo + CheckOSS CheckNAS CheckX11 CheckGGI @@ -1531,6 +1521,7 @@ *-*-aix*) ARCH=aix CheckDummyVideo + CheckOSS CheckNAS CheckX11 CheckGGI
--- a/docs.html Wed May 23 00:06:08 2001 +0000 +++ b/docs.html Wed May 23 00:36:17 2001 +0000 @@ -16,6 +16,7 @@ Major changes since SDL 1.0.0: </H2> <UL> + <LI> 1.2.1: Added detection of Open Sound System on Solaris x86 <LI> 1.2.1: Added initial support for Nano-X (thanks Hsieh-Fu!) <LI> 1.2.1: Fixed endian detection on IA64 architectures (thanks Bill!) <LI> 1.2.1: Added --disable-dga configure option to disable DGA
--- a/src/audio/SDL_audio.c Wed May 23 00:06:08 2001 +0000 +++ b/src/audio/SDL_audio.c Wed May 23 00:36:17 2001 +0000 @@ -40,11 +40,6 @@ /* Available audio drivers */ static AudioBootStrap *bootstrap[] = { -#if defined(unix) && \ - !defined(linux) && !defined(__FreeBSD__) && !defined(__CYGWIN32__) \ - && !defined(__bsdi__) - &AUDIO_bootstrap, -#endif #ifdef OSS_SUPPORT &DSP_bootstrap, &DMA_bootstrap, @@ -52,6 +47,10 @@ #ifdef ALSA_SUPPORT &ALSA_bootstrap, #endif +#if (defined(unix) && !defined(__CYGWIN32__)) && \ + !defined(OSS_SUPPORT) && !defined(ALSA_SUPPORT) + &AUDIO_bootstrap, +#endif #ifdef ARTSC_SUPPORT &ARTSC_bootstrap, #endif
--- a/src/audio/SDL_sysaudio.h Wed May 23 00:06:08 2001 +0000 +++ b/src/audio/SDL_sysaudio.h Wed May 23 00:36:17 2001 +0000 @@ -99,11 +99,6 @@ SDL_AudioDevice *(*create)(int devindex); } AudioBootStrap; -#if defined(unix) && \ - !defined(linux) && !defined(__FreeBSD__) && !defined(__CYGWIN32__) \ - && !defined(__bsdi__) -extern AudioBootStrap AUDIO_bootstrap; -#endif #ifdef OSS_SUPPORT extern AudioBootStrap DSP_bootstrap; extern AudioBootStrap DMA_bootstrap; @@ -111,6 +106,10 @@ #ifdef ALSA_SUPPORT extern AudioBootStrap ALSA_bootstrap; #endif +#if (defined(unix) && !defined(__CYGWIN32__)) && \ + !defined(OSS_SUPPORT) && !defined(ALSA_SUPPORT) +extern AudioBootStrap AUDIO_bootstrap; +#endif #ifdef ARTSC_SUPPORT extern AudioBootStrap ARTSC_bootstrap; #endif
--- a/src/audio/dma/SDL_dmaaudio.c Wed May 23 00:06:08 2001 +0000 +++ b/src/audio/dma/SDL_dmaaudio.c Wed May 23 00:36:17 2001 +0000 @@ -39,21 +39,7 @@ #include <sys/ioctl.h> #include <sys/stat.h> #include <sys/mman.h> -#ifdef linux -#include <linux/soundcard.h> -#endif -#ifdef __bsdi__ #include <sys/soundcard.h> -#endif -#ifdef __FreeBSD__ -#include <machine/soundcard.h> -#endif -#ifdef __OpenBSD__ -#include <soundcard.h> -#endif -#ifdef __USLC__ -#include <sys/soundcard.h> -#endif #ifndef MAP_FAILED #define MAP_FAILED ((Uint8 *)-1)
--- a/src/audio/dsp/SDL_dspaudio.c Wed May 23 00:06:08 2001 +0000 +++ b/src/audio/dsp/SDL_dspaudio.c Wed May 23 00:36:17 2001 +0000 @@ -37,21 +37,7 @@ #include <sys/time.h> #include <sys/ioctl.h> #include <sys/stat.h> -#ifdef linux -#include <linux/soundcard.h> -#endif -#ifdef __bsdi__ #include <sys/soundcard.h> -#endif -#ifdef __FreeBSD__ -#include <machine/soundcard.h> -#endif -#ifdef __OpenBSD__ -#include <soundcard.h> -#endif -#ifdef __USLC__ -#include <sys/soundcard.h> -#endif #include "SDL_audio.h" #include "SDL_error.h"