From 8470399a0c6676b6dc582e438d10d333f93c0cb6 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Thu, 27 Jan 2011 20:45:26 +1300 Subject: [PATCH] [osx] Load packages from the support dir. --- OpenRA.Launcher.Mac/Controller.m | 1 + .../Release/OpenRA.app/Contents/MacOS/OpenRA | Bin 81728 -> 81736 bytes OpenRA.Launcher.Mac/main.m | 3 ++- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenRA.Launcher.Mac/Controller.m b/OpenRA.Launcher.Mac/Controller.m index 5b96a0947b..791db648eb 100644 --- a/OpenRA.Launcher.Mac/Controller.m +++ b/OpenRA.Launcher.Mac/Controller.m @@ -125,6 +125,7 @@ extern char **environ; monoPath, [NSString stringWithFormat:@"UtilityPath=%@", [[[NSBundle mainBundle] executablePath] stringByAddingPercentEscapesUsingEncoding:NSASCIIStringEncoding]], [NSString stringWithFormat:@"SupportDir=%@",[@"~/Library/Application Support/OpenRA" stringByExpandingTildeInPath]], + [NSString stringWithFormat:@"SpecialPackageRoot=%@/",[@"~/Library/Application Support/OpenRA" stringByExpandingTildeInPath]], nil]; FSRef appRef; CFURLGetFSRef((CFURLRef)[NSURL URLWithString:[[[NSBundle mainBundle] executablePath] stringByAddingPercentEscapesUsingEncoding:NSASCIIStringEncoding]], &appRef); diff --git a/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA b/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA index 82e725fa141b751a1d3529ff66aa164ac56c328a..6dd080c849a6df7438993773745c62cb039b544f 100755 GIT binary patch delta 13257 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 Ry!5uolxI0mai?_3{C`plxQPG& delta 13121 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 Bjluu` diff --git a/OpenRA.Launcher.Mac/main.m b/OpenRA.Launcher.Mac/main.m index 1da612fe84..8987557928 100644 --- a/OpenRA.Launcher.Mac/main.m +++ b/OpenRA.Launcher.Mac/main.m @@ -13,7 +13,7 @@ int main(int argc, char *argv[]) { /* When launching a mod, the arguments are of the form * --launch */ - if (argc >= 7 && strcmp(argv[1], "--launch") == 0) + if (argc >= 8 && strcmp(argv[1], "--launch") == 0) { /* Change into the game dir */ chdir(argv[3]); @@ -25,6 +25,7 @@ int main(int argc, char *argv[]) "OpenRA.Game.exe", argv[5], argv[6], + argv[7], NULL };