From 3fc9b6a9dac0a2e00ff5ce61d6e5daebffdb9d60 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Tue, 9 May 2006 15:14:48 +0000
Subject: [PATCH] Fixed bug #218

Currently there are two Classic-only drivers defined in "SDL_config_macos.h",
and the ones in "SDL_config_macosx.h" are Mach-O/framework-only (i.e. not CFM)

As a workaround, I disabled CDROM and JOYSTICK when building SDL for CFM
Carbon.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401755
---
 include/SDL_config_macos.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/SDL_config_macos.h b/include/SDL_config_macos.h
index 261fc828f..6b922c0b2 100644
--- a/include/SDL_config_macos.h
+++ b/include/SDL_config_macos.h
@@ -73,10 +73,18 @@ typedef unsigned long	uintptr_t;
 #define SDL_AUDIO_DRIVER_DUMMY	1
 
 /* Enable various cdrom drivers */
-#define SDL_CDROM_MACOS	1
+#if TARGET_API_MAC_CARBON
+#define SDL_CDROM_DUMMY		1
+#else
+#define SDL_CDROM_MACOS		1
+#endif
 
 /* Enable various input drivers */
+#if TARGET_API_MAC_CARBON
+#define SDL_JOYSTICK_DUMMY	1
+#else
 #define SDL_JOYSTICK_MACOS	1
+#endif
 
 /* Enable various shared object loading systems */
 #define SDL_LOADSO_MACOS	1