diff --git a/packaging/osx/OpenRA.app/Contents/MacOS/OpenRA b/packaging/osx/OpenRA.app/Contents/MacOS/OpenRA index 7004dd9d88..8956e0ff23 100755 --- a/packaging/osx/OpenRA.app/Contents/MacOS/OpenRA +++ b/packaging/osx/OpenRA.app/Contents/MacOS/OpenRA @@ -29,8 +29,8 @@ GAME_PATH=$RESOURCES_PATH SUPPORT_PATH=~/Library/"Application Support"/OpenRA # Downloadable content -DEPS_PACKAGE="osx-deps-v1.zip" -DEPS_URL="http://open-ra.org/releases/mac/osx-deps-v1.zip" +DEPS_PACKAGE="osx-deps-v2.zip" +DEPS_URL="http://open-ra.org/releases/mac/osx-deps-v2.zip" RA_PACKAGE="ra-packages.zip" RA_URL="http://open-ra.org/packages/ra-packages.zip" CNC_PACKAGE="cnc-packages.zip" diff --git a/packaging/osx/package-deps.sh b/packaging/osx/package-deps.sh index 2157a3a0a1..da1eee49fc 100755 --- a/packaging/osx/package-deps.sh +++ b/packaging/osx/package-deps.sh @@ -11,7 +11,8 @@ PWD=`pwd` PACKAGING_PATH="$PWD/osxbuild" BINARY_PATH="$PACKAGING_PATH/deps" LIB_PATH="$BINARY_PATH/lib" -SYSTEM_MONO="/Library/Frameworks/Mono.framework/Versions/2.6.3" +MONO_VERSION="2.6.7" +SYSTEM_MONO="/Library/Frameworks/Mono.framework/Versions/"${MONO_VERSION} # dylibs referred to by dlls in the gac; won't show up to otool GAC_DYLIBS="$SYSTEM_MONO/lib/libMonoPosixHelper.dylib $SYSTEM_MONO/lib/libgdiplus.dylib " @@ -73,7 +74,7 @@ for i in $DLLS; do echo "Patching config: $CONFIG" # Remove any references to the hardcoded mono framework; the game will look in the right location anyway - sed "s/\/Library\/Frameworks\/Mono.framework\/Versions\/2.6.3\///" "$i.config" > "${CONFIG}_1" + sed "s/\/Library\/Frameworks\/Mono.framework\/Versions\/${MONO_VERSION}\///" "$i.config" > "${CONFIG}_1" sed "s/\/Library\/Frameworks\/Cg.framework/lib/" "${CONFIG}_1" > "${CONFIG}_2" sed "s/\/Library\/Frameworks\/SDL.framework/lib/" "${CONFIG}_2" > $CONFIG rm "${CONFIG}_1" "${CONFIG}_2" @@ -97,8 +98,8 @@ cp -X /Library/Frameworks/SDL.framework/SDL $LIB_PATH chmod 755 $LIB_PATH/SDL cd "$BINARY_PATH" -zip osx-deps-v1 -r -9 * -mv osx-deps-v1.zip "$PACKAGING_PATH" +zip osx-deps-v2 -r -9 * +mv osx-deps-v2.zip "$PACKAGING_PATH" rm -rf "$BINARY_PATH" echo "All Done!" diff --git a/packaging/osx/package-game.sh b/packaging/osx/package-game.sh index 08e96de8a5..07a4c6f68c 100755 --- a/packaging/osx/package-game.sh +++ b/packaging/osx/package-game.sh @@ -9,7 +9,7 @@ SOURCE_PATH="$PWD/." BUNDLE_PATH="$SOURCE_PATH/packaging/osx/OpenRA.app" TARGET_PATH="$PACKAGING_PATH/OpenRA.app/Contents/Resources" -FILES="OpenRA.Game.exe OpenRA.Gl.dll OpenRA.FileFormats.dll FreeSans.ttf FreeSansBold.ttf titles.ttf shaders maps mods/ra mods/cnc" +FILES="OpenRA.Game.exe OpenRA.Gl.dll OpenRA.FileFormats.dll FreeSans.ttf FreeSansBold.ttf titles.ttf shaders mods/ra mods/cnc" EXCLUDE="*.mdb ./mods/cnc/packages/*.mix ./mods/ra/packages/*.mix ./mods/cnc/packages/*.MIX ./mods/ra/packages/*.MIX" # Copy source files into packaging dir