From 347aeaa02be5e8a1ae8da0c074b5adb41ef38532 Mon Sep 17 00:00:00 2001 From: David Catmull Date: Sun, 19 Jun 2011 16:10:40 -0600 Subject: [PATCH 1/2] build for 10.6 --- GitX.xcodeproj/project.pbxproj | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/GitX.xcodeproj/project.pbxproj b/GitX.xcodeproj/project.pbxproj index 132fb0d..b5e360e 100644 --- a/GitX.xcodeproj/project.pbxproj +++ b/GitX.xcodeproj/project.pbxproj @@ -1618,7 +1618,6 @@ LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = GitX; - SDKROOT = ""; WRAPPER_EXTENSION = app; ZERO_LINK = YES; }; @@ -1646,7 +1645,6 @@ INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = ""; PRODUCT_NAME = GitX; - SDKROOT = ""; WRAPPER_EXTENSION = app; }; name = Release; @@ -1665,7 +1663,7 @@ INFOPLIST_PREPROCESS = YES; MACOSX_DEPLOYMENT_TARGET = 10.5; PREBINDING = NO; - SDKROOT = macosx10.5; + SDKROOT = macosx10.6; }; name = Debug; }; @@ -1682,7 +1680,7 @@ INFOPLIST_PREPROCESS = YES; MACOSX_DEPLOYMENT_TARGET = 10.5; PREBINDING = NO; - SDKROOT = macosx10.5; + SDKROOT = macosx10.6; }; name = Release; }; From d0480c82d44346d2848547f85126fd00ab12687d Mon Sep 17 00:00:00 2001 From: David Catmull Date: Sun, 19 Jun 2011 16:13:54 -0600 Subject: [PATCH 2/2] replace URLByAppendingPathComponent:isDirectory: (requires 10.7) with URLByAppendingPathComponent: (requires 10.6) --- PBWebController.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PBWebController.m b/PBWebController.m index c325d77..653a84a 100644 --- a/PBWebController.m +++ b/PBWebController.m @@ -37,9 +37,9 @@ [view setResourceLoadDelegate:self]; NSURL *resourceURL = [[[NSBundle mainBundle] resourceURL] URLByStandardizingPath]; - NSURL *baseURL = [[resourceURL URLByAppendingPathComponent:@"html/views" isDirectory:YES] URLByAppendingPathComponent:startFile isDirectory:YES]; + NSURL *baseURL = [[resourceURL URLByAppendingPathComponent:@"html/views"] URLByAppendingPathComponent:startFile]; - NSURL *fileURL = [baseURL URLByAppendingPathComponent:@"index.html" isDirectory:NO]; + NSURL *fileURL = [baseURL URLByAppendingPathComponent:@"index.html"]; [[view mainFrame] loadRequest:[NSURLRequest requestWithURL:fileURL]]; }