Remove redundant defines.

2005-10-24 08:17:12 +00:00
parent 3f93a76b21
commit cb229a8774
8 changed files with 19 additions and 21 deletions
@@ -4,7 +4,7 @@
 #include "arch/arch_platform.h"

 /* ArchHooks driver selector. */
-#if defined(HAVE_MACOSX)
+#if defined(__MACOSX__)
 #include "ArchHooks_darwin.h"

 #elif defined(UNIX)
@@ -7,7 +7,7 @@
 #if defined(WIN32)
 #include "DialogDriver_Win32.h"

-#elif defined(HAVE_COCOA)
+#elif defined(__MACOSX__)
 #include "DialogDriver_Cocoa.h"
 #endif

@@ -17,7 +17,7 @@
 // NOTE: If X11 is available, we don't use LLW_SDL, which IH_SDL depends on.
 #if defined(HAVE_X11)
 #include "InputHandler_X11.h"
-#elif defined(HAVE_CARBON)
+#elif defined(__MACOSX__)
 #include "InputHandler_Carbon.h"
 #elif defined(HAVE_SDL)
 #include "InputHandler_SDL.h"
@@ -6,7 +6,7 @@
 /* LoadingWindow driver selector. */
 #include "LoadingWindow_Null.h"

-#if defined(HAVE_COCOA)
+#if defined(__MACOSX__)
 #include "LoadingWindow_Cocoa.h"

 #elif defined(HAVE_GTK)
@@ -9,7 +9,7 @@
 #include "RageSoundDriver_ALSA9_Software.h"
 #endif

-#ifdef HAVE_COREAUDIO
+#if defined(__MACOSX__)
 #include "RageSoundDriver_CA.h"
 #endif

@@ -15,8 +15,8 @@
 #define DEFAULT_INPUT_DRIVER_LIST "DirectInput,Pump,Para"
 #elif defined(HAVE_X11) // Prefer X11 over SDL
 #define DEFAULT_INPUT_DRIVER_LIST "X11,Joystick"
-#elif defined(HAVE_CARBON)
-# define DEFAULT_INPUT_DRIVER_LIST "Carbon"
+#elif defined(__MACOSX__)
+# define DEFAULT_INPUT_DRIVER_LIST "Carbon,SDL"
 #elif defined(HAVE_SDL)
 #define DEFAULT_INPUT_DRIVER_LIST "SDL"
 #elif defined(LINUX)
@@ -3,14 +3,6 @@

 // In here, you define which APIs are guaranteed to be available on which OSes.
 // Don't ever actually #include anything here -- that's for */Selector_*.h.
-#if defined(__MACOSX__)
-#define HAVE_MACOSX
-#define HAVE_COCOA
-#define HAVE_COREAUDIO
-#define HAVE_CARBON
-#define HAVE_SDL
-#define HAVE_CRYPTOPP
-#endif
 #if defined(_WINDOWS)
 #define HAVE_DIRECTX
 #define HAVE_FFMPEG