diff --git a/stepmania/src/arch/arch.cpp b/stepmania/src/arch/arch.cpp index 8a8df22cb7..809c3a2f2b 100644 --- a/stepmania/src/arch/arch.cpp +++ b/stepmania/src/arch/arch.cpp @@ -13,7 +13,7 @@ #include "arch_default.h" /* Override them with arch-specific drivers, as available. */ -#if defined(LINUX) +#if defined(LINUX) && !(defined DARWIN) #include "arch_linux.h" #elif defined(WIN32) #include "arch_Win32.h" @@ -55,7 +55,7 @@ RageSoundDriver *MakeRageSoundDriver(CString drivers) if(!DriversToTry[i].CompareNoCase("DirectSound-sw")) ret = new RageSound_DSound_Software; if(!DriversToTry[i].CompareNoCase("WaveOut")) ret = new RageSound_WaveOut; #endif -#ifdef LINUX /* should use some define akin to HAS_ALSA9 */ +#if defined(LINUX) && !defined(DARWIN) /* should use some define akin to HAS_ALSA9 */ if(!DriversToTry[i].CompareNoCase("ALSA9")) ret = new RageSound_ALSA9; #endif if(!DriversToTry[i].CompareNoCase("Null")) ret = new RageSound_Null; diff --git a/stepmania/src/arch/arch.h b/stepmania/src/arch/arch.h index 7b1329af20..8fe9c3a31a 100644 --- a/stepmania/src/arch/arch.h +++ b/stepmania/src/arch/arch.h @@ -18,7 +18,7 @@ void MakeInputHandlers(vector &Add); RageSoundDriver *MakeRageSoundDriver(CString drivers); /* Define the default list of sound drivers for each arch. */ -#if defined(LINUX) +#if defined(LINUX) && !defined(DARWIN) #define DEFAULT_SOUND_DRIVER_LIST "ALSA9,Null" #elif defined(WIN32) #define DEFAULT_SOUND_DRIVER_LIST "DirectSound,DirectSound-sw,WaveOut"