epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade osx launcher project to xcode 4, remove unnecessary webkit reference, fix bogus arg passing to OpenRA.Utility (now passes everything)

Browse Source
This commit is contained in:
Paul Chote
2011-03-30 21:07:49 +13:00
parent 3dda9ee607
commit c746a3e81a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Launcher.Mac/Controller.m
View File

@@ -58,14 +58,16 @@ extern char **environ;
- (void)extractZip:(NSArray *)args - (void)extractZip:(NSArray *)args
{ {
// Todo: check if we can write to the requested dir, escalate priviledges if required. // 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]; [self runUtilityWithArgs:a];
} }
- (void)installRAPackages:(NSArray *)args - (void)installRAPackages:(NSArray *)args
{ {
// Todo: check if we can write to the requested dir, escalate priviledges if required. // 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]; [self runUtilityWithArgs:a];
} }

6
OpenRA.Launcher.Mac/OpenRA.xcodeproj/project.pbxproj
View File

@@ -13,7 +13,6 @@
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
DA81FA821290F5C800C48F2F /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = DA81FA811290F5C800C48F2F /* Controller.m */; }; DA81FA821290F5C800C48F2F /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = DA81FA811290F5C800C48F2F /* Controller.m */; };
DA81FBDC12910E4900C48F2F /* OpenRA.icns in Resources */ = {isa = PBXBuildFile; fileRef = DA81FBDB12910E4900C48F2F /* OpenRA.icns */; }; 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 */; }; DAB887F5129E5D6C00C99407 /* SDL in Resources */ = {isa = PBXBuildFile; fileRef = DAB887EE129E5D6100C99407 /* SDL */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
@@ -40,7 +39,6 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
DA9295A712921DF900EDB02E /* WebKit.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@@ -235,7 +233,9 @@
"$(inherited)", "$(inherited)",
"\"$(SRCROOT)\"", "\"$(SRCROOT)\"",
); );
MACOSX_DEPLOYMENT_TARGET = 10.5;
PRODUCT_NAME = OpenRA; PRODUCT_NAME = OpenRA;
SDKROOT = macosx10.6;
}; };
name = Debug; name = Debug;
}; };
@@ -253,7 +253,9 @@
"$(inherited)", "$(inherited)",
"\"$(SRCROOT)\"", "\"$(SRCROOT)\"",
); );
MACOSX_DEPLOYMENT_TARGET = 10.5;
PRODUCT_NAME = OpenRA; PRODUCT_NAME = OpenRA;
SDKROOT = macosx10.6;
}; };
name = Release; name = Release;
}; };