From c746a3e81aedfd5f1cfa145481a3dde85b668ffd Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Wed, 30 Mar 2011 21:07:49 +1300 Subject: [PATCH] Upgrade osx launcher project to xcode 4, remove unnecessary webkit reference, fix bogus arg passing to OpenRA.Utility (now passes everything) --- OpenRA.Launcher.Mac/Controller.m | 6 ++++-- OpenRA.Launcher.Mac/OpenRA.xcodeproj/project.pbxproj | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/OpenRA.Launcher.Mac/Controller.m b/OpenRA.Launcher.Mac/Controller.m index 8e2f88fb3f..277f107839 100644 --- a/OpenRA.Launcher.Mac/Controller.m +++ b/OpenRA.Launcher.Mac/Controller.m @@ -58,14 +58,16 @@ extern char **environ; - (void)extractZip:(NSArray *)args { // Todo: check if we can write to the requested dir, escalate priviledges if required. - NSArray *a = [NSArray arrayWithObjects:@"--extract-zip-inner", [args objectAtIndex:2], [args objectAtIndex:3], nil]; + NSMutableArray *a = [NSMutableArray arrayWithArray:args]; + [a replaceObjectAtIndex:0 withObject:@"--extract-zip-inner"]; [self runUtilityWithArgs:a]; } - (void)installRAPackages:(NSArray *)args { // Todo: check if we can write to the requested dir, escalate priviledges if required. - NSArray *a = [NSArray arrayWithObjects:@"--install-ra-packages-inner", [args objectAtIndex:2], [args objectAtIndex:3], nil]; + NSMutableArray *a = [NSMutableArray arrayWithArray:args]; + [a replaceObjectAtIndex:0 withObject:@"--install-ra-packages-inner"]; [self runUtilityWithArgs:a]; } diff --git a/OpenRA.Launcher.Mac/OpenRA.xcodeproj/project.pbxproj b/OpenRA.Launcher.Mac/OpenRA.xcodeproj/project.pbxproj index 878f66cc8a..10fe86041d 100644 --- a/OpenRA.Launcher.Mac/OpenRA.xcodeproj/project.pbxproj +++ b/OpenRA.Launcher.Mac/OpenRA.xcodeproj/project.pbxproj @@ -13,7 +13,6 @@ 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; DA81FA821290F5C800C48F2F /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = DA81FA811290F5C800C48F2F /* Controller.m */; }; DA81FBDC12910E4900C48F2F /* OpenRA.icns in Resources */ = {isa = PBXBuildFile; fileRef = DA81FBDB12910E4900C48F2F /* OpenRA.icns */; }; - DA9295A712921DF900EDB02E /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA9295A612921DF900EDB02E /* WebKit.framework */; }; DAB887F5129E5D6C00C99407 /* SDL in Resources */ = {isa = PBXBuildFile; fileRef = DAB887EE129E5D6100C99407 /* SDL */; }; /* End PBXBuildFile section */ @@ -40,7 +39,6 @@ buildActionMask = 2147483647; files = ( 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, - DA9295A712921DF900EDB02E /* WebKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -235,7 +233,9 @@ "$(inherited)", "\"$(SRCROOT)\"", ); + MACOSX_DEPLOYMENT_TARGET = 10.5; PRODUCT_NAME = OpenRA; + SDKROOT = macosx10.6; }; name = Debug; }; @@ -253,7 +253,9 @@ "$(inherited)", "\"$(SRCROOT)\"", ); + MACOSX_DEPLOYMENT_TARGET = 10.5; PRODUCT_NAME = OpenRA; + SDKROOT = macosx10.6; }; name = Release; };