pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug 1363 - SDL 1.2 hg does not compile against the 10.5 SDK

Browse source 
Alexei Svitkine 2012-01-05 15:55:47 PST
Open SDL.xcodeproject and change SDK to 10.5 and try to build. It will fail.

There are two errors:

1. Incorrect SDK version check in src/cdrom/macosx/AudioFilePlayer.h, which
redefines FSIORefNum. FSIORefNum is actually defined in the 10.5 SDK, but not
in the 10.4 one.

2. Code in SDL_QuartzVideo.m that tries to access NSScreen's private _frame
ivar, which fails to link on 64-bit. See:
https://www.google.com/?q=%22_OBJC_IVAR_%24_NSScreen._frame%22

Attached patch fixes both of these problems.

--HG--
branch : SDL-1.2
This commit is contained in:
Sam Lantinga 2012-01-05 19:19:58 -05:00
parent 47e574b123
commit 660eea303e
2 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cdrom/macosx/AudioFilePlayer.h
View file

@ -37,7 +37,7 @@
#include <AudioUnit/AUNTComponent.h> #include <AudioUnit/AUNTComponent.h>
#endif #endif
#if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1050) #if (MAC_OS_X_VERSION_MAX_ALLOWED < 1050)
typedef SInt16 FSIORefNum; typedef SInt16 FSIORefNum;
#endif #endif

35
src/video/quartz/SDL_QuartzVideo.m
View file

@ -36,7 +36,18 @@ CG_EXTERN size_t CGDisplayBytesPerRow(CGDirectDisplayID display)
__IPHONE_NA, __IPHONE_NA); __IPHONE_NA, __IPHONE_NA);
#endif #endif
#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1060) /* Fixed in Snow Leopard */
static inline BOOL IS_LION_OR_LATER(_THIS)
{
return (system_version >= 0x1070);
}
static inline BOOL IS_SNOW_LEOPARD_OR_LATER(_THIS)
{
return (system_version >= 0x1060);
}
#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1060) && !defined(__LP64__) /* Fixed in Snow Leopard */
/* /*
Add methods to get at private members of NSScreen. Add methods to get at private members of NSScreen.
Since there is a bug in Apple's screen switching code Since there is a bug in Apple's screen switching code
@ -54,12 +65,14 @@ CG_EXTERN size_t CGDisplayBytesPerRow(CGDirectDisplayID display)
_frame = frame; _frame = frame;
} }
@end @end
static inline void QZ_SetFrame(NSScreen *nsscreen, NSRect frame) static inline void QZ_SetFrame(_THIS, NSScreen *nsscreen, NSRect frame)
{ {
[nsscreen setFrame:frame]; if (!IS_SNOW_LEOPARD_OR_LATER(this)) {
[nsscreen setFrame:frame];
}
} }
#else #else
static inline void QZ_SetFrame(NSScreen *nsscreen, NSRect frame) static inline void QZ_SetFrame(_THIS, NSScreen *nsscreen, NSRect frame)
{ {
} }
#endif #endif
@ -125,16 +138,6 @@ VideoBootStrap QZ_bootstrap = {
# endif # endif
#endif #endif
static inline BOOL IS_LION_OR_LATER(_THIS)
{
return (system_version >= 0x1070);
}
static inline BOOL IS_SNOW_LEOPARD_OR_LATER(_THIS)
{
return (system_version >= 0x1060);
}
static void QZ_ReleaseDisplayMode(_THIS, const void *moderef) static void QZ_ReleaseDisplayMode(_THIS, const void *moderef)
{ {
/* we only own these references in the 10.6+ API. */ /* we only own these references in the 10.6+ API. */
@ -607,7 +610,7 @@ static void QZ_UnsetVideoMode (_THIS, BOOL to_desktop, BOOL save_gl)
See comment in QZ_SetVideoFullscreen for why we do this See comment in QZ_SetVideoFullscreen for why we do this
*/ */
screen_rect = NSMakeRect(0,0,device_width,device_height); screen_rect = NSMakeRect(0,0,device_width,device_height);
QZ_SetFrame([ NSScreen mainScreen ], screen_rect); QZ_SetFrame(this, [ NSScreen mainScreen ], screen_rect);
} }
} }
/* Release window mode resources */ /* Release window mode resources */
@ -927,7 +930,7 @@ static SDL_Surface* QZ_SetVideoFullScreen (_THIS, SDL_Surface *current, int widt
ourselves. This hack should be removed if/when the bug is fixed. ourselves. This hack should be removed if/when the bug is fixed.
*/ */
screen_rect = NSMakeRect(0,0,width,height); screen_rect = NSMakeRect(0,0,width,height);
QZ_SetFrame([ NSScreen mainScreen ], screen_rect); QZ_SetFrame(this, [ NSScreen mainScreen ], screen_rect);
/* Save the flags to ensure correct tear-down */ /* Save the flags to ensure correct tear-down */
mode_flags = current->flags; mode_flags = current->flags;