From 0f9bb0cda69dd4192071e95d16a5bf3e7110fb54 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 2 Mar 2014 12:58:00 -0800 Subject: [PATCH] Updated to build on Mac OS X 10.7 with Xcode 4.6 --- README-macosx.txt | 6 +++--- src/video/cocoa/SDL_cocoaevents.m | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README-macosx.txt b/README-macosx.txt index 4d9378fdd92a3..895b9d142f95f 100644 --- a/README-macosx.txt +++ b/README-macosx.txt @@ -26,9 +26,9 @@ ABI compatibility on x86_64 architectures. For best compatibility you should compile your application the same way. A script which wraps gcc to make this easy is provided in test/gcc-fat.sh -Please note that building SDL requires at least the 10.7 SDK (even if you -target back to 10.5 systems). PowerPC support for Mac OS X has been officially -dropped as of SDL 2.0.2. +Please note that building SDL requires at least Xcode 4.6 and the 10.7 SDK +(even if you target back to 10.5 systems). PowerPC support for Mac OS X has +been officially dropped as of SDL 2.0.2. To use the library once it's built, you essential have two possibilities: use the traditional autoconf/automake/make method, or use Xcode. diff --git a/src/video/cocoa/SDL_cocoaevents.m b/src/video/cocoa/SDL_cocoaevents.m index 9e9fccf558b51..d1dab03b35278 100644 --- a/src/video/cocoa/SDL_cocoaevents.m +++ b/src/video/cocoa/SDL_cocoaevents.m @@ -271,10 +271,9 @@ - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filenam CreateApplicationMenus(); } [NSApp finishLaunching]; - NSDictionary *appDefaults = @{ - @"AppleMomentumScrollSupported": @NO, - @"ApplePressAndHoldEnabled": @NO, - }; + NSDictionary *appDefaults = [[NSDictionary alloc] initWithObjectsAndKeys: + NO, @"AppleMomentumScrollSupported", + NO, @"ApplePressAndHoldEnabled"]; [[NSUserDefaults standardUserDefaults] registerDefaults:appDefaults]; }