actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix compilation on everything but Darwin.

Browse Source 
I'd suggest not spending any more time on SDL sound code; it's just going
to give you a headache.  Use a native API ...
This commit is contained in:
Glenn Maynard
2003-06-14 18:12:39 +00:00
parent 26d900ac6d
commit 95c71724a1
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/arch.cpp
+3 -8
View File
@@ -21,8 +21,6 @@
#include "arch_Win32.h" #include "arch_Win32.h"
#endif #endif
#include "Sound/RageSoundDriver_SDL.h"
LoadingWindow *MakeLoadingWindow() { return new ARCH_LOADING_WINDOW; } LoadingWindow *MakeLoadingWindow() { return new ARCH_LOADING_WINDOW; }
ErrorDialog *MakeErrorDialog() { return new ARCH_ERROR_DIALOG; } ErrorDialog *MakeErrorDialog() { return new ARCH_ERROR_DIALOG; }
ArchHooks *MakeArchHooks() { return new ARCH_HOOKS; } ArchHooks *MakeArchHooks() { return new ARCH_HOOKS; }
@@ -71,12 +69,9 @@ RageSoundDriver *MakeRageSoundDriver(CString drivers)
#ifdef HAVE_OSS #ifdef HAVE_OSS
if(!DriversToTry[i].CompareNoCase("OSS")) ret = new RageSound_OSS; if(!DriversToTry[i].CompareNoCase("OSS")) ret = new RageSound_OSS;
#endif #endif
if(!DriversToTry[i].CompareNoCase("SDL")) #ifdef RAGE_SOUND_SDL
try { if(!DriversToTry[i].CompareNoCase("SDL")) ret = new RageSound_SDL;
ret = new RageSound_SDL; #endif
} catch (RageException e) {
ret = NULL;
}
if(!DriversToTry[i].CompareNoCase("Null")) ret = new RageSound_Null; if(!DriversToTry[i].CompareNoCase("Null")) ret = new RageSound_Null;
if( !ret ) if( !ret )
LOG->Warn("Unknown sound driver name: %s", DriversToTry[i].c_str()); LOG->Warn("Unknown sound driver name: %s", DriversToTry[i].c_str());
stepmania/src/arch/arch_darwin.h
+2 -1
View File
@@ -11,6 +11,7 @@
*/ */
#include <SDL.h> #include <SDL.h>
#include "RageSoundDriver_SDL.h" #include "Sound/RageSoundDriver_SDL.h"
#endif #endif