This commit is contained in:
Paul Chote
2010-03-18 20:11:38 +13:00
parent 3c643160de
commit 9c5e7bd0e5
5 changed files with 12 additions and 8 deletions

View File

@@ -9,5 +9,5 @@ cd "$APP_PATH/Contents/Resources"
if [ ! -e mods/ra/packages/redalert.mix ]; then if [ ! -e mods/ra/packages/redalert.mix ]; then
osascript install_ra_mix.scpt osascript install_ra_mix.scpt
else else
./OpenRA ./OpenRA settings=../../../launcher.ini
fi fi

View File

@@ -12,8 +12,8 @@
</object> </object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<integer value="372"/>
<integer value="29"/> <integer value="29"/>
<integer value="372"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
@@ -264,11 +264,11 @@
<string key="NSName">_NSMainMenu</string> <string key="NSName">_NSMainMenu</string>
</object> </object>
<object class="NSWindowTemplate" id="972006081"> <object class="NSWindowTemplate" id="972006081">
<int key="NSWindowStyleMask">15</int> <int key="NSWindowStyleMask">7</int>
<int key="NSWindowBacking">2</int> <int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{855, 323}, {300, 300}}</string> <string key="NSWindowRect">{{855, 323}, {300, 300}}</string>
<int key="NSWTFlags">1954021376</int> <int key="NSWTFlags">1954022400</int>
<string key="NSWindowTitle">OpenRA</string> <string key="NSWindowTitle">OpenRA Launcher</string>
<string key="NSWindowClass">NSWindow</string> <string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/> <nil key="NSViewClass"/>
<string key="NSWindowContentMaxSize">{300, 300}</string> <string key="NSWindowContentMaxSize">{300, 300}</string>
@@ -1082,7 +1082,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/> <integer value="1"/>
<string>{{525, 802}, {197, 73}}</string> <string>{{525, 802}, {197, 73}}</string>
<string>{{380, 836}, {221, 20}}</string> <string>{{226, 941}, {221, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/> <integer value="1"/>
<string>{74, 862}</string> <string>{74, 862}</string>

View File

@@ -14,6 +14,7 @@
8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
DA1241101151F194002EFE2B /* OpenRa.icns in Resources */ = {isa = PBXBuildFile; fileRef = DA12410F1151F194002EFE2B /* OpenRa.icns */; }; DA1241101151F194002EFE2B /* OpenRa.icns in Resources */ = {isa = PBXBuildFile; fileRef = DA12410F1151F194002EFE2B /* OpenRa.icns */; };
DAFD657B11520799001F4C97 /* launcher.ini in Resources */ = {isa = PBXBuildFile; fileRef = DAFD657A11520799001F4C97 /* launcher.ini */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
@@ -32,6 +33,7 @@
8D1107310486CEB800E47090 /* OpenRA-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "OpenRA-Info.plist"; sourceTree = "<group>"; }; 8D1107310486CEB800E47090 /* OpenRA-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "OpenRA-Info.plist"; sourceTree = "<group>"; };
8D1107320486CEB800E47090 /* OpenRA.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OpenRA.app; sourceTree = BUILT_PRODUCTS_DIR; }; 8D1107320486CEB800E47090 /* OpenRA.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OpenRA.app; sourceTree = BUILT_PRODUCTS_DIR; };
DA12410F1151F194002EFE2B /* OpenRa.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = OpenRa.icns; sourceTree = "<group>"; }; DA12410F1151F194002EFE2B /* OpenRa.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = OpenRa.icns; sourceTree = "<group>"; };
DAFD657A11520799001F4C97 /* launcher.ini */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = launcher.ini; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
@@ -107,6 +109,7 @@
29B97317FDCFA39411CA2CEA /* Resources */ = { 29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
DAFD657A11520799001F4C97 /* launcher.ini */,
8D1107310486CEB800E47090 /* OpenRA-Info.plist */, 8D1107310486CEB800E47090 /* OpenRA-Info.plist */,
DA12410F1151F194002EFE2B /* OpenRa.icns */, DA12410F1151F194002EFE2B /* OpenRa.icns */,
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
@@ -171,6 +174,7 @@
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */, 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */, 1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */,
DA1241101151F194002EFE2B /* OpenRa.icns in Resources */, DA1241101151F194002EFE2B /* OpenRa.icns in Resources */,
DAFD657B11520799001F4C97 /* launcher.ini in Resources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };

View File

@@ -4,7 +4,7 @@
# All dependencies are packaged inside the game bundle # All dependencies are packaged inside the game bundle
# List of game files to copy into the app bundle # List of game files to copy into the app bundle
GAME_FILES="OpenRA shaders maps packaging/osx/settings.ini FreeSans.ttf FreeSansBold.ttf" GAME_FILES="OpenRA shaders maps FreeSans.ttf FreeSansBold.ttf"
# List of mods to include # List of mods to include
MODS="ra cnc" MODS="ra cnc"
@@ -16,7 +16,7 @@ MODS_INCLUDE_FILES="find mods/$m ! -name \"*.mdb\" ! -name \"packages\""
GAC_DYLIBS="/Library/Frameworks/Mono.framework/Versions/2.6.1/lib/libMonoPosixHelper.dylib /Library/Frameworks/Mono.framework/Versions/2.6.1/lib/libgdiplus.dylib" GAC_DYLIBS="/Library/Frameworks/Mono.framework/Versions/2.6.1/lib/libMonoPosixHelper.dylib /Library/Frameworks/Mono.framework/Versions/2.6.1/lib/libgdiplus.dylib"
# Remove old app bundle # Remove old app bundle
rm -r OpenRA.app rm -r OpenRA.app OpenRA
# Recursively modify and copy the mono files depended on by OpenRA into the app bundle # Recursively modify and copy the mono files depended on by OpenRA into the app bundle
function patch_mono { function patch_mono {