The-Homebrew-Cloud/Ryujinx-SDL
2
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-09-21 22:48:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bump SDL to build with 10.7 SDK.

Browse Source 
This also bumps the minimum requirement for building SDL to 10.7, and
removes some checking we no longer need.

CR: saml
This commit is contained in:
Sam Lantinga 2013-12-27 10:18:11 -08:00
parent fce6257c49
commit 27779311b4
3 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/SDL_platform.h
View File

@ -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__) */

13
src/video/cocoa/SDL_cocoaopengl.m
View File

@ -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

24
src/video/cocoa/SDL_cocoawindow.m
View File

@ -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 @@ SetWindowStyle(SDL_Window * window, unsigned int style)
[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 @@ SetWindowStyle(SDL_Window * window, unsigned int style)
-(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 @@ SetWindowStyle(SDL_Window * window, unsigned int style)
[nswindow performSelectorOnMainThread: @selector(toggleFullScreen:) withObject:nswindow waitUntilDone:NO];
return YES;
#else
return NO;
#endif /* SDK >= 10.7 */
}
-(BOOL) isInFullscreenSpace
@ -282,12 +272,10 @@ SetWindowStyle(SDL_Window * window, unsigned int style)
[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 @@ Cocoa_CreateWindow(_THIS, SDL_Window * window)
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 @@ SDL_bool
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 @@ Cocoa_SetWindowFullscreenSpace(SDL_Window * window, SDL_bool state)
}
[pool release];
#endif /* SDK 10.7+ */
return succeeded;
}