From 95c71724a162341adf869d4eb2578da582f922d8 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 14 Jun 2003 18:12:39 +0000
Subject: [PATCH] Fix compilation on everything but Darwin.

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 ...
---
 stepmania/src/arch/arch.cpp      | 11 +++--------
 stepmania/src/arch/arch_darwin.h |  3 ++-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/stepmania/src/arch/arch.cpp b/stepmania/src/arch/arch.cpp
index 53e608e491..34fca9643e 100644
--- a/stepmania/src/arch/arch.cpp
+++ b/stepmania/src/arch/arch.cpp
@@ -21,8 +21,6 @@
 #include "arch_Win32.h"
 #endif
 
-#include "Sound/RageSoundDriver_SDL.h"
-
 LoadingWindow *MakeLoadingWindow() { return new ARCH_LOADING_WINDOW; }
 ErrorDialog *MakeErrorDialog() { return new ARCH_ERROR_DIALOG; }
 ArchHooks *MakeArchHooks() { return new ARCH_HOOKS; }
@@ -71,12 +69,9 @@ RageSoundDriver *MakeRageSoundDriver(CString drivers)
 #ifdef HAVE_OSS
 			if(!DriversToTry[i].CompareNoCase("OSS")) ret = new RageSound_OSS;
 #endif
-            if(!DriversToTry[i].CompareNoCase("SDL"))
-              try {
-                ret = new RageSound_SDL;
-              } catch (RageException e) {
-                ret = NULL;
-              }
+#ifdef RAGE_SOUND_SDL
+            if(!DriversToTry[i].CompareNoCase("SDL")) ret = new RageSound_SDL;
+#endif
 			if(!DriversToTry[i].CompareNoCase("Null")) ret = new RageSound_Null;
 			if( !ret )
 				LOG->Warn("Unknown sound driver name: %s", DriversToTry[i].c_str());
diff --git a/stepmania/src/arch/arch_darwin.h b/stepmania/src/arch/arch_darwin.h
index 4dd303f7c7..b0cc448e33 100644
--- a/stepmania/src/arch/arch_darwin.h
+++ b/stepmania/src/arch/arch_darwin.h
@@ -11,6 +11,7 @@
  */
 
 #include <SDL.h>
-#include "RageSoundDriver_SDL.h"
+#include "Sound/RageSoundDriver_SDL.h"
+
 #endif