diff options
author | Chris Robinson <[email protected]> | 2011-08-20 00:41:47 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2011-08-20 00:41:47 -0700 |
commit | 9989f33fc24042578bf4bf2c50a06a6366d07c1d (patch) | |
tree | cdf87e14c0333069c3ba791109c753c3ebf9784e | |
parent | ba4456d24aa013118e70fa1158def7ad18e8d66e (diff) |
Move backend sources to a separate sub-directory
-rw-r--r-- | Alc/backends/alsa.c (renamed from Alc/alsa.c) | 0 | ||||
-rw-r--r-- | Alc/backends/coreaudio.c (renamed from Alc/coreaudio.c) | 0 | ||||
-rw-r--r-- | Alc/backends/dsound.c (renamed from Alc/dsound.c) | 0 | ||||
-rw-r--r-- | Alc/backends/loopback.c (renamed from Alc/loopback.c) | 0 | ||||
-rw-r--r-- | Alc/backends/mmdevapi.c (renamed from Alc/mmdevapi.c) | 0 | ||||
-rw-r--r-- | Alc/backends/null.c (renamed from Alc/null.c) | 0 | ||||
-rw-r--r-- | Alc/backends/opensl.c (renamed from Alc/opensl.c) | 0 | ||||
-rw-r--r-- | Alc/backends/oss.c (renamed from Alc/oss.c) | 0 | ||||
-rw-r--r-- | Alc/backends/portaudio.c (renamed from Alc/portaudio.c) | 0 | ||||
-rw-r--r-- | Alc/backends/pulseaudio.c (renamed from Alc/pulseaudio.c) | 0 | ||||
-rw-r--r-- | Alc/backends/sndio.c (renamed from Alc/sndio.c) | 0 | ||||
-rw-r--r-- | Alc/backends/solaris.c (renamed from Alc/solaris.c) | 0 | ||||
-rw-r--r-- | Alc/backends/wave.c (renamed from Alc/wave.c) | 0 | ||||
-rw-r--r-- | Alc/backends/winmm.c (renamed from Alc/winmm.c) | 0 | ||||
-rw-r--r-- | CMakeLists.txt | 29 |
15 files changed, 15 insertions, 14 deletions
diff --git a/Alc/alsa.c b/Alc/backends/alsa.c index ffed94a8..ffed94a8 100644 --- a/Alc/alsa.c +++ b/Alc/backends/alsa.c diff --git a/Alc/coreaudio.c b/Alc/backends/coreaudio.c index c84be846..c84be846 100644 --- a/Alc/coreaudio.c +++ b/Alc/backends/coreaudio.c diff --git a/Alc/dsound.c b/Alc/backends/dsound.c index 08a1d13a..08a1d13a 100644 --- a/Alc/dsound.c +++ b/Alc/backends/dsound.c diff --git a/Alc/loopback.c b/Alc/backends/loopback.c index 86e53555..86e53555 100644 --- a/Alc/loopback.c +++ b/Alc/backends/loopback.c diff --git a/Alc/mmdevapi.c b/Alc/backends/mmdevapi.c index 702569c6..702569c6 100644 --- a/Alc/mmdevapi.c +++ b/Alc/backends/mmdevapi.c diff --git a/Alc/null.c b/Alc/backends/null.c index dd1ac216..dd1ac216 100644 --- a/Alc/null.c +++ b/Alc/backends/null.c diff --git a/Alc/opensl.c b/Alc/backends/opensl.c index 88d05505..88d05505 100644 --- a/Alc/opensl.c +++ b/Alc/backends/opensl.c diff --git a/Alc/oss.c b/Alc/backends/oss.c index 724b23c2..724b23c2 100644 --- a/Alc/oss.c +++ b/Alc/backends/oss.c diff --git a/Alc/portaudio.c b/Alc/backends/portaudio.c index 4f3dfd5f..4f3dfd5f 100644 --- a/Alc/portaudio.c +++ b/Alc/backends/portaudio.c diff --git a/Alc/pulseaudio.c b/Alc/backends/pulseaudio.c index 39df3282..39df3282 100644 --- a/Alc/pulseaudio.c +++ b/Alc/backends/pulseaudio.c diff --git a/Alc/sndio.c b/Alc/backends/sndio.c index 5f9ad0cd..5f9ad0cd 100644 --- a/Alc/sndio.c +++ b/Alc/backends/sndio.c diff --git a/Alc/solaris.c b/Alc/backends/solaris.c index b2b8196d..b2b8196d 100644 --- a/Alc/solaris.c +++ b/Alc/backends/solaris.c diff --git a/Alc/wave.c b/Alc/backends/wave.c index 465087ce..465087ce 100644 --- a/Alc/wave.c +++ b/Alc/backends/wave.c diff --git a/Alc/winmm.c b/Alc/backends/winmm.c index 445dd51e..445dd51e 100644 --- a/Alc/winmm.c +++ b/Alc/backends/winmm.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 9901f511..6d343a62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -387,8 +387,9 @@ SET(ALC_OBJS Alc/ALc.c Alc/hrtf.c Alc/mixer.c Alc/panning.c - Alc/loopback.c - Alc/null.c + # Default backends, always available + Alc/backends/loopback.c + Alc/backends/null.c ) SET(BACKENDS "") @@ -411,7 +412,7 @@ IF(ALSA) CHECK_SHARED_FUNCTION_EXISTS(snd_pcm_open "alsa/asoundlib.h" asound "" HAVE_LIBASOUND) IF(HAVE_LIBASOUND OR HAVE_DLFCN_H OR WIN32) SET(HAVE_ALSA 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/alsa.c) + SET(ALC_OBJS ${ALC_OBJS} Alc/backends/alsa.c) IF(HAVE_DLFCN_H OR WIN32) SET(BACKENDS "${BACKENDS} ALSA,") ELSE() @@ -430,7 +431,7 @@ IF(OSS) CHECK_INCLUDE_FILE(sys/soundcard.h HAVE_SYS_SOUNDCARD_H) IF(HAVE_SYS_SOUNDCARD_H) SET(HAVE_OSS 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/oss.c) + SET(ALC_OBJS ${ALC_OBJS} Alc/backends/oss.c) SET(BACKENDS "${BACKENDS} OSS,") ENDIF() ENDIF() @@ -443,7 +444,7 @@ IF(SOLARIS) CHECK_INCLUDE_FILE(sys/audioio.h HAVE_SYS_AUDIOIO_H) IF(HAVE_SYS_AUDIOIO_H) SET(HAVE_SOLARIS 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/solaris.c) + SET(ALC_OBJS ${ALC_OBJS} Alc/backends/solaris.c) SET(BACKENDS "${BACKENDS} Solaris,") ENDIF() ENDIF() @@ -458,7 +459,7 @@ IF(SNDIO) CHECK_SHARED_FUNCTION_EXISTS(sio_open "sndio.h" sndio "" HAVE_LIBSNDIO) IF(HAVE_LIBSNDIO OR HAVE_DLFCN_H OR WIN32) SET(HAVE_SNDIO 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/sndio.c) + SET(ALC_OBJS ${ALC_OBJS} Alc/backends/sndio.c) IF(HAVE_DLFCN_H OR WIN32) SET(BACKENDS "${BACKENDS} SndIO,") ELSE() @@ -478,7 +479,7 @@ IF(HAVE_WINDOWS_H) CHECK_INCLUDE_FILE(mmdeviceapi.h HAVE_MMDEVICEAPI_H) IF(HAVE_MMDEVICEAPI_H) SET(HAVE_MMDEVAPI 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/mmdevapi.c) + SET(ALC_OBJS ${ALC_OBJS} Alc/backends/mmdevapi.c) SET(BACKENDS "${BACKENDS} MMDevApi,") ENDIF() @@ -495,7 +496,7 @@ IF(DSOUND) CHECK_SHARED_FUNCTION_EXISTS(DirectSoundCreate "dsound.h" dsound "" HAVE_LIBDSOUND) IF(HAVE_LIBDSOUND OR HAVE_DLFCN_H OR WIN32) SET(HAVE_DSOUND 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/dsound.c) + SET(ALC_OBJS ${ALC_OBJS} Alc/backends/dsound.c) IF(HAVE_DLFCN_H OR WIN32) SET(BACKENDS "${BACKENDS} DirectSound,") @@ -515,7 +516,7 @@ IF(HAVE_WINDOWS_H) CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H -D_WIN32_WINNT=0x0500) IF(HAVE_MMSYSTEM_H AND HAVE_LIBWINMM) SET(HAVE_WINMM 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/winmm.c) + SET(ALC_OBJS ${ALC_OBJS} Alc/backends/winmm.c) SET(BACKENDS "${BACKENDS} WinMM,") ENDIF() ENDIF() @@ -531,7 +532,7 @@ IF(PORTAUDIO) CHECK_SHARED_FUNCTION_EXISTS(Pa_Initialize "portaudio.h" portaudio "" HAVE_LIBPORTAUDIO) IF(HAVE_LIBPORTAUDIO OR HAVE_DLFCN_H OR WIN32) SET(HAVE_PORTAUDIO 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/portaudio.c) + SET(ALC_OBJS ${ALC_OBJS} Alc/backends/portaudio.c) IF(HAVE_DLFCN_H OR WIN32) SET(BACKENDS "${BACKENDS} PortAudio,") ELSE() @@ -552,7 +553,7 @@ IF(PULSEAUDIO) CHECK_SHARED_FUNCTION_EXISTS(pa_context_new "pulse/pulseaudio.h" pulse "" HAVE_LIBPULSE) IF(HAVE_LIBPULSE OR HAVE_DLFCN_H OR WIN32) SET(HAVE_PULSEAUDIO 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/pulseaudio.c) + SET(ALC_OBJS ${ALC_OBJS} Alc/backends/pulseaudio.c) IF(HAVE_DLFCN_H OR WIN32) SET(BACKENDS "${BACKENDS} PulseAudio,") ELSE() @@ -571,7 +572,7 @@ IF(COREAUDIO) CHECK_INCLUDE_FILE(/System/Library/Frameworks/CoreAudio.framework/Headers/CoreAudio.h HAVE_COREAUDIO_FRAMEWORK) IF(HAVE_COREAUDIO_FRAMEWORK) SET(HAVE_COREAUDIO 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/coreaudio.c) + SET(ALC_OBJS ${ALC_OBJS} Alc/backends/coreaudio.c) SET(BACKENDS "${BACKENDS} CoreAudio,") SET(EXTRA_LIBS /System/Library/Frameworks/CoreAudio.framework ${EXTRA_LIBS}) SET(EXTRA_LIBS /System/Library/Frameworks/AudioUnit.framework ${EXTRA_LIBS}) @@ -589,7 +590,7 @@ IF(OPENSL) CHECK_SHARED_FUNCTION_EXISTS(slCreateEngine "SLES/OpenSLES.h" OpenSLES "" HAVE_LIBOPENSLES) IF(HAVE_LIBOPENSLES) SET(HAVE_OPENSL 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/opensl.c) + SET(ALC_OBJS ${ALC_OBJS} Alc/backends/opensl.c) SET(BACKENDS "${BACKENDS} OpenSL,") SET(EXTRA_LIBS OpenSLES ${EXTRA_LIBS}) ENDIF() @@ -602,7 +603,7 @@ ENDIF() # Optionally enable the Wave Writer backend IF(WAVE) SET(HAVE_WAVE 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/wave.c) + SET(ALC_OBJS ${ALC_OBJS} Alc/backends/wave.c) SET(BACKENDS "${BACKENDS} WaveFile,") ENDIF() |