From 9c5e7bd0e5dcbc28b907ec8a1029325f972cef62 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Thu, 18 Mar 2010 20:11:38 +1300 Subject: [PATCH] Tweaks --- packaging/osx/OpenRA.app/Contents/MacOS/OpenRA | 2 +- packaging/osx/launcher/English.lproj/MainMenu.xib | 10 +++++----- .../osx/launcher/OpenRA.xcodeproj/project.pbxproj | 4 ++++ packaging/osx/{settings.ini => launcher/launcher.ini} | 0 packaging/osx/package.sh | 4 ++-- 5 files changed, 12 insertions(+), 8 deletions(-) rename packaging/osx/{settings.ini => launcher/launcher.ini} (100%) diff --git a/packaging/osx/OpenRA.app/Contents/MacOS/OpenRA b/packaging/osx/OpenRA.app/Contents/MacOS/OpenRA index 7c6567519d..2700d2ac10 100755 --- a/packaging/osx/OpenRA.app/Contents/MacOS/OpenRA +++ b/packaging/osx/OpenRA.app/Contents/MacOS/OpenRA @@ -9,5 +9,5 @@ cd "$APP_PATH/Contents/Resources" if [ ! -e mods/ra/packages/redalert.mix ]; then osascript install_ra_mix.scpt else -./OpenRA +./OpenRA settings=../../../launcher.ini fi \ No newline at end of file diff --git a/packaging/osx/launcher/English.lproj/MainMenu.xib b/packaging/osx/launcher/English.lproj/MainMenu.xib index cfec77b01f..56c799d1e2 100644 --- a/packaging/osx/launcher/English.lproj/MainMenu.xib +++ b/packaging/osx/launcher/English.lproj/MainMenu.xib @@ -12,8 +12,8 @@ YES - + YES @@ -264,11 +264,11 @@ _NSMainMenu - 15 + 7 2 {{855, 323}, {300, 300}} - 1954021376 - OpenRA + 1954022400 + OpenRA Launcher NSWindow {300, 300} @@ -1082,7 +1082,7 @@ com.apple.InterfaceBuilder.CocoaPlugin {{525, 802}, {197, 73}} - {{380, 836}, {221, 20}} + {{226, 941}, {221, 20}} com.apple.InterfaceBuilder.CocoaPlugin {74, 862} diff --git a/packaging/osx/launcher/OpenRA.xcodeproj/project.pbxproj b/packaging/osx/launcher/OpenRA.xcodeproj/project.pbxproj index 489404df5d..7e978b1344 100644 --- a/packaging/osx/launcher/OpenRA.xcodeproj/project.pbxproj +++ b/packaging/osx/launcher/OpenRA.xcodeproj/project.pbxproj @@ -14,6 +14,7 @@ 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; 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 */ /* Begin PBXFileReference section */ @@ -32,6 +33,7 @@ 8D1107310486CEB800E47090 /* OpenRA-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "OpenRA-Info.plist"; sourceTree = ""; }; 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 = ""; }; + DAFD657A11520799001F4C97 /* launcher.ini */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = launcher.ini; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -107,6 +109,7 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + DAFD657A11520799001F4C97 /* launcher.ini */, 8D1107310486CEB800E47090 /* OpenRA-Info.plist */, DA12410F1151F194002EFE2B /* OpenRa.icns */, 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, @@ -171,6 +174,7 @@ 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */, 1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */, DA1241101151F194002EFE2B /* OpenRa.icns in Resources */, + DAFD657B11520799001F4C97 /* launcher.ini in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/packaging/osx/settings.ini b/packaging/osx/launcher/launcher.ini similarity index 100% rename from packaging/osx/settings.ini rename to packaging/osx/launcher/launcher.ini diff --git a/packaging/osx/package.sh b/packaging/osx/package.sh index ac0c03f685..a16713eaff 100755 --- a/packaging/osx/package.sh +++ b/packaging/osx/package.sh @@ -4,7 +4,7 @@ # All dependencies are packaged inside the game 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 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" # 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 function patch_mono {