We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

Bug 218 - SDL_config_macos.h and Carbon
Summary: SDL_config_macos.h and Carbon
Status: RESOLVED FIXED
Alias: None
Product: SDL
Classification: Unclassified
Component: build (show other bugs)
Version: HG 1.2
Hardware: PowerPC Mac OS X (All)
: P2 normal
Assignee: Ryan C. Gordon
QA Contact: Sam Lantinga
URL:
Keywords:
Depends on:
Blocks: 53
  Show dependency tree / graph
 
Reported: 2006-05-09 05:54 UTC by Anders F Bj
Modified: 2006-05-09 11:21 UTC (History)
0 users

See Also:

Attachments
SDL12-macconfig.patch (802 bytes, patch)
2006-05-09 05:55 UTC, Anders F Bj 		Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Anders F Bj 2006-05-09 05:54:04 UTC 
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.
Comment 1 Anders F Bj 2006-05-09 05:55:48 UTC 
Created attachment 115 [details]
SDL12-macconfig.patch
Comment 2 Anders F Bj 2006-05-09 06:10:22 UTC 
Comment on attachment 115 [details]
SDL12-macconfig.patch

Index: include/SDL_config_macos.h
===================================================================
RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/include/SDL_config_macos.h,v
retrieving revision 1.10
diff -u -r1.10 SDL_config_macos.h
--- include/SDL_config_macos.h	12 Apr 2006 14:38:47 -0000	1.10
+++ include/SDL_config_macos.h	9 May 2006 10:09:19 -0000
@@ -73,10 +73,18 @@
 #define SDL_AUDIO_DRIVER_DUMMY	1
 
 /* Enable various cdrom drivers */
+#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
Comment 3 Anders F Bj 2006-05-09 06:11:36 UTC 
the really old builds didn't have "TARGET_API_MACOS8" set,
so I reversed the logic in the conditionals to leave it out.
Comment 4 Sam Lantinga 2006-05-09 11:15:32 UTC 
This patch is in Subversion, thanks!
BTW, did you know you can edit one patch to obsolete it, and then attach a new patch?
I manually added the second version that you entered, so it's fine.
Comment 5 Anders F Bj 2006-05-09 11:21:10 UTC 
Yeah, I was kinda hoping it would edit/replace the first patch but in retrospect I should have just added the new one as a new attachment and obsoleted the old...

Thanks.