# HG changeset patch # User Sam Lantinga # Date 1147187688 0 # Node ID 00ea6cf49a4edb1e36dc8f3c9d5b75cb068dbb11 # Parent 398ac0f88e4dd9dd67b5147239451c17d1da690e 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. diff -r 398ac0f88e4d -r 00ea6cf49a4e include/SDL_config_macos.h --- a/include/SDL_config_macos.h Tue May 09 15:09:47 2006 +0000 +++ b/include/SDL_config_macos.h Tue May 09 15:14:48 2006 +0000 @@ -73,10 +73,18 @@ #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