Merge remote branch 'pchote/master'
This commit is contained in:
@@ -5,4 +5,9 @@
|
|||||||
|
|
||||||
APP_PATH=`echo $0 | awk '{split($0,patharr,"/"); idx=1; while(patharr[idx+3] != "") { if (patharr[idx] != "/") {printf("%s/", patharr[idx]); idx++ }} }'`
|
APP_PATH=`echo $0 | awk '{split($0,patharr,"/"); idx=1; while(patharr[idx+3] != "") { if (patharr[idx] != "/") {printf("%s/", patharr[idx]); idx++ }} }'`
|
||||||
cd "$APP_PATH/Contents/Resources"
|
cd "$APP_PATH/Contents/Resources"
|
||||||
|
|
||||||
|
if [ ! -e mods/ra/packages/redalert.mix ]; then
|
||||||
|
osascript install_ra_mix.scpt
|
||||||
|
else
|
||||||
./OpenRA
|
./OpenRA
|
||||||
|
fi
|
||||||
BIN
packaging/osx/OpenRA.app/Contents/Resources/install_ra_mix.scpt
Normal file
BIN
packaging/osx/OpenRA.app/Contents/Resources/install_ra_mix.scpt
Normal file
Binary file not shown.
@@ -31,7 +31,7 @@ function patch_mono {
|
|||||||
|
|
||||||
# Force 32-bit build and set the pkg-config path for mono.pc
|
# Force 32-bit build and set the pkg-config path for mono.pc
|
||||||
export AS="as -arch i386"
|
export AS="as -arch i386"
|
||||||
export CC="gcc -arch i386"
|
export CC="gcc -arch i386 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk"
|
||||||
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig/
|
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig/
|
||||||
|
|
||||||
# Package the server binary
|
# Package the server binary
|
||||||
|
|||||||
Reference in New Issue
Block a user