From 27779311b4539abc93ffac833b90010193de043f Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 27 Dec 2013 10:18:11 -0800 Subject: [PATCH] Bump SDL to build with 10.7 SDK. This also bumps the minimum requirement for building SDL to 10.7, and removes some checking we no longer need. CR: saml --- include/SDL_platform.h | 3 --- src/video/cocoa/SDL_cocoaopengl.m | 13 ------------- src/video/cocoa/SDL_cocoawindow.m | 24 ++++-------------------- 3 files changed, 4 insertions(+), 36 deletions(-) diff --git a/include/SDL_platform.h b/include/SDL_platform.h index f12592b4eb6ed..7e56c45b84a1d 100644 --- a/include/SDL_platform.h +++ b/include/SDL_platform.h @@ -82,9 +82,6 @@ #if MAC_OS_X_VERSION_MIN_REQUIRED < 1050 # error SDL for Mac OS X only supports deploying on 10.5 and above. #endif /* MAC_OS_X_VERSION_MIN_REQUIRED < 1050 */ -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 -# error SDL for Mac OS X must be built with a 10.6 SDK or above. -#endif /* MAC_OS_X_VERSION_MAX_ALLOWED < 1060 */ #endif /* TARGET_OS_IPHONE */ #endif /* defined(__APPLE__) */ diff --git a/src/video/cocoa/SDL_cocoaopengl.m b/src/video/cocoa/SDL_cocoaopengl.m index 803b92f538912..443a5bc3de34c 100644 --- a/src/video/cocoa/SDL_cocoaopengl.m +++ b/src/video/cocoa/SDL_cocoaopengl.m @@ -35,19 +35,6 @@ #define DEFAULT_OPENGL "/System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib" -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 -/* New methods for converting to and from backing store pixels, taken from - * AppKit/NSView.h in 10.8 SDK. */ -@interface NSView (Backing) -- (NSPoint)convertPointToBacking:(NSPoint)aPoint; -- (NSPoint)convertPointFromBacking:(NSPoint)aPoint; -- (NSSize)convertSizeToBacking:(NSSize)aSize; -- (NSSize)convertSizeFromBacking:(NSSize)aSize; -- (NSRect)convertRectToBacking:(NSRect)aRect; -- (NSRect)convertRectFromBacking:(NSRect)aRect; -@end -#endif - #ifndef kCGLPFAOpenGLProfile #define kCGLPFAOpenGLProfile 99 #endif diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m index 2578d9f3c8b01..9a88cfdeb6df8 100644 --- a/src/video/cocoa/SDL_cocoawindow.m +++ b/src/video/cocoa/SDL_cocoawindow.m @@ -22,6 +22,10 @@ #if SDL_VIDEO_DRIVER_COCOA +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 +# error SDL for Mac OS X must be built with a 10.7 SDK or above. +#endif /* MAC_OS_X_VERSION_MAX_ALLOWED < 1070 */ + #include "SDL_syswm.h" #include "SDL_timer.h" /* For SDL_GetTicks() */ #include "SDL_hints.h" @@ -35,14 +39,6 @@ #include "SDL_cocoamouse.h" #include "SDL_cocoaopengl.h" -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 -/* Taken from AppKit/NSOpenGLView.h in 10.8 SDK. */ -@interface NSView (NSOpenGLSurfaceResolution) -- (BOOL)wantsBestResolutionOpenGLSurface; -- (void)setWantsBestResolutionOpenGLSurface:(BOOL)flag; -@end -#endif - static Uint32 s_moveHack; static void ConvertNSRect(NSRect *r) @@ -140,12 +136,10 @@ - (void)listen:(SDL_WindowData *)data [center addObserver:self selector:@selector(windowDidDeminiaturize:) name:NSWindowDidDeminiaturizeNotification object:window]; [center addObserver:self selector:@selector(windowDidBecomeKey:) name:NSWindowDidBecomeKeyNotification object:window]; [center addObserver:self selector:@selector(windowDidResignKey:) name:NSWindowDidResignKeyNotification object:window]; -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 [center addObserver:self selector:@selector(windowWillEnterFullScreen:) name:NSWindowWillEnterFullScreenNotification object:window]; [center addObserver:self selector:@selector(windowDidEnterFullScreen:) name:NSWindowDidEnterFullScreenNotification object:window]; [center addObserver:self selector:@selector(windowWillExitFullScreen:) name:NSWindowWillExitFullScreenNotification object:window]; [center addObserver:self selector:@selector(windowDidExitFullScreen:) name:NSWindowDidExitFullScreenNotification object:window]; -#endif /* Mac OS X 10.7+ */ } else { [window setDelegate:self]; } @@ -211,7 +205,6 @@ -(void) resumeVisibleObservation -(BOOL) setFullscreenSpace:(BOOL) state; { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 SDL_Window *window = _data->window; NSWindow *nswindow = _data->nswindow; @@ -245,9 +238,6 @@ -(BOOL) setFullscreenSpace:(BOOL) state; [nswindow performSelectorOnMainThread: @selector(toggleFullScreen:) withObject:nswindow waitUntilDone:NO]; return YES; -#else - return NO; -#endif /* SDK >= 10.7 */ } -(BOOL) isInFullscreenSpace @@ -282,12 +272,10 @@ - (void)close [center removeObserver:self name:NSWindowDidDeminiaturizeNotification object:window]; [center removeObserver:self name:NSWindowDidBecomeKeyNotification object:window]; [center removeObserver:self name:NSWindowDidResignKeyNotification object:window]; -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 [center removeObserver:self name:NSWindowWillEnterFullScreenNotification object:window]; [center removeObserver:self name:NSWindowDidEnterFullScreenNotification object:window]; [center removeObserver:self name:NSWindowWillExitFullScreenNotification object:window]; [center removeObserver:self name:NSWindowDidExitFullScreenNotification object:window]; -#endif /* Mac OS X 10.7+ */ } else { [window setDelegate:nil]; } @@ -931,14 +919,12 @@ - (void)resetCursorRects return -1; } [nswindow setBackgroundColor:[NSColor blackColor]]; -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 if ([nswindow respondsToSelector:@selector(setCollectionBehavior:)]) { const char *hint = SDL_GetHint(SDL_HINT_VIDEO_FULLSCREEN_SPACES); if (hint && SDL_atoi(hint) > 0) { [nswindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary]; } } -#endif /* Create a default view for this window */ rect = [nswindow contentRectForFrameRect:[nswindow frame]]; @@ -1419,7 +1405,6 @@ - (void)resetCursorRects Cocoa_SetWindowFullscreenSpace(SDL_Window * window, SDL_bool state) { SDL_bool succeeded = SDL_FALSE; -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; SDL_WindowData *data = (SDL_WindowData *) window->driverdata; @@ -1428,7 +1413,6 @@ - (void)resetCursorRects } [pool release]; -#endif /* SDK 10.7+ */ return succeeded; }