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

Added detection of Open Sound System on Solaris x86

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%4036
This commit is contained in:
Sam Lantinga 2001-05-23 00:36:17 +00:00
parent 0445aeab47
commit 09112109c3
6 changed files with 14 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

19
configure.in
View file

@ -242,21 +242,7 @@ CheckOSS()
AC_MSG_CHECKING(for OSS audio support) AC_MSG_CHECKING(for OSS audio support)
have_oss=no have_oss=no
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#ifdef linux
#include <linux/soundcard.h>
#endif
#ifdef __FreeBSD__
#include <machine/soundcard.h>
#endif
#ifdef __bsdi__
#include <sys/soundcard.h> #include <sys/soundcard.h>
#endif
#ifdef __OpenBSD__
#include <soundcard.h>
#endif
#ifdef __USLC__
#include <sys/soundcard.h>
#endif
],[ ],[
int arg = SNDCTL_DSP_SETFRAGMENT; int arg = SNDCTL_DSP_SETFRAGMENT;
],[ ],[
@ -1146,6 +1132,8 @@ case "$target" in
CheckDummyVideo CheckDummyVideo
CheckNASM CheckNASM
CheckOSS CheckOSS
CheckARTSC
CheckESD
CheckNAS CheckNAS
CheckX11 CheckX11
CheckDGA CheckDGA
@ -1386,6 +1374,7 @@ case "$target" in
CFLAGS="$CFLAGS -D__ELF__" # Fix for nasm on Solaris x86 CFLAGS="$CFLAGS -D__ELF__" # Fix for nasm on Solaris x86
CheckDummyVideo CheckDummyVideo
CheckNASM CheckNASM
CheckOSS
CheckARTSC CheckARTSC
CheckESD CheckESD
CheckNAS CheckNAS
@ -1488,6 +1477,7 @@ case "$target" in
*-*-hpux*) *-*-hpux*)
ARCH=hpux ARCH=hpux
CheckDummyVideo CheckDummyVideo
CheckOSS
CheckNAS CheckNAS
CheckX11 CheckX11
CheckGGI CheckGGI
@ -1531,6 +1521,7 @@ case "$target" in
*-*-aix*) *-*-aix*)
ARCH=aix ARCH=aix
CheckDummyVideo CheckDummyVideo
CheckOSS
CheckNAS CheckNAS
CheckX11 CheckX11
CheckGGI CheckGGI

1
docs.html
View file

@ -16,6 +16,7 @@ be found at the <A HREF="http://www.libsdl.org/"> main SDL page</A>.
Major changes since SDL 1.0.0: Major changes since SDL 1.0.0:
</H2> </H2>
<UL> <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: 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: Fixed endian detection on IA64 architectures (thanks Bill!)
<LI> 1.2.1: Added --disable-dga configure option to disable DGA <LI> 1.2.1: Added --disable-dga configure option to disable DGA

9
src/audio/SDL_audio.c
View file

@ -40,11 +40,6 @@ static char rcsid =
/* Available audio drivers */ /* Available audio drivers */
static AudioBootStrap *bootstrap[] = { static AudioBootStrap *bootstrap[] = {
#if defined(unix) && \
!defined(linux) && !defined(__FreeBSD__) && !defined(__CYGWIN32__) \
&& !defined(__bsdi__)
&AUDIO_bootstrap,
#endif
#ifdef OSS_SUPPORT #ifdef OSS_SUPPORT
&DSP_bootstrap, &DSP_bootstrap,
&DMA_bootstrap, &DMA_bootstrap,
@ -52,6 +47,10 @@ static AudioBootStrap *bootstrap[] = {
#ifdef ALSA_SUPPORT #ifdef ALSA_SUPPORT
&ALSA_bootstrap, &ALSA_bootstrap,
#endif #endif
#if (defined(unix) && !defined(__CYGWIN32__)) && \
!defined(OSS_SUPPORT) && !defined(ALSA_SUPPORT)
&AUDIO_bootstrap,
#endif
#ifdef ARTSC_SUPPORT #ifdef ARTSC_SUPPORT
&ARTSC_bootstrap, &ARTSC_bootstrap,
#endif #endif

9
src/audio/SDL_sysaudio.h
View file

@ -99,11 +99,6 @@ typedef struct AudioBootStrap {
SDL_AudioDevice *(*create)(int devindex); SDL_AudioDevice *(*create)(int devindex);
} AudioBootStrap; } AudioBootStrap;
#if defined(unix) && \
!defined(linux) && !defined(__FreeBSD__) && !defined(__CYGWIN32__) \
&& !defined(__bsdi__)
extern AudioBootStrap AUDIO_bootstrap;
#endif
#ifdef OSS_SUPPORT #ifdef OSS_SUPPORT
extern AudioBootStrap DSP_bootstrap; extern AudioBootStrap DSP_bootstrap;
extern AudioBootStrap DMA_bootstrap; extern AudioBootStrap DMA_bootstrap;
@ -111,6 +106,10 @@ extern AudioBootStrap DMA_bootstrap;
#ifdef ALSA_SUPPORT #ifdef ALSA_SUPPORT
extern AudioBootStrap ALSA_bootstrap; extern AudioBootStrap ALSA_bootstrap;
#endif #endif
#if (defined(unix) && !defined(__CYGWIN32__)) && \
!defined(OSS_SUPPORT) && !defined(ALSA_SUPPORT)
extern AudioBootStrap AUDIO_bootstrap;
#endif
#ifdef ARTSC_SUPPORT #ifdef ARTSC_SUPPORT
extern AudioBootStrap ARTSC_bootstrap; extern AudioBootStrap ARTSC_bootstrap;
#endif #endif

14
src/audio/dma/SDL_dmaaudio.c
View file

@ -39,21 +39,7 @@ static char rcsid =
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/mman.h> #include <sys/mman.h>
#ifdef linux
#include <linux/soundcard.h>
#endif
#ifdef __bsdi__
#include <sys/soundcard.h> #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 #ifndef MAP_FAILED
#define MAP_FAILED ((Uint8 *)-1) #define MAP_FAILED ((Uint8 *)-1)

14
src/audio/dsp/SDL_dspaudio.c
View file

@ -37,21 +37,7 @@ static char rcsid =
#include <sys/time.h> #include <sys/time.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef linux
#include <linux/soundcard.h>
#endif
#ifdef __bsdi__
#include <sys/soundcard.h> #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_audio.h"
#include "SDL_error.h" #include "SDL_error.h"