diff --git a/Makefile b/Makefile index 1451cf2059..0418e292da 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ game_TARGET = OpenRa.Game.exe game_KIND = winexe game_DEPS = $(fileformats_TARGET) game_LIBS = $(COMMON_LIBS) System.Windows.Forms.dll $(game_DEPS) \ - thirdparty/Tao/Tao.OpenAl.dll thirdparty/Tao/Tao.Freetype.dll + thirdparty/Tao/Tao.OpenAl.dll thirdparty/Tao/Tao.FreeType.dll game_FLAGS = -win32icon:OpenRa.Game/OpenRa.ico ra_SRCS = $(shell find OpenRa.Mods.RA/ -iname '*.cs') diff --git a/packaging/osx/package.sh b/packaging/osx/package.sh index 5a74fbcddc..82e31215b4 100755 --- a/packaging/osx/package.sh +++ b/packaging/osx/package.sh @@ -4,11 +4,20 @@ # All dependencies are packaged inside the game bundle # List of game files to copy into the app bundle -GAME_FILES="OpenRA shaders mods maps packaging/osx/settings.ini FreeSans.ttf FreeSansBold.ttf" +GAME_FILES="OpenRA shaders maps packaging/osx/settings.ini FreeSans.ttf FreeSansBold.ttf" + +# List of mods to include +MODS="ra" + +# Files/directories to include +MODS_INCLUDE_FILES="find mods/$m ! -name \"*.mdb\" ! -name \"packages\"" # dylibs referred to by dlls in the gac; won't show up to otool 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 + # Recursively modify and copy the mono files depended on by OpenRA into the app bundle function patch_mono { echo "Patching: "$1 @@ -29,6 +38,17 @@ function patch_mono { done } +function copy_mods { + for m in $MODS; do + mkdir -p "OpenRA.app/Contents/Resources/mods/$m" + + #for f in $( find mods/$m \! -name "*.mdb" \! -name "packages"); do + #for f in `$MODS_INCLUDE_FILES`; do + cp -R "mods/$m/" "OpenRA.app/Contents/Resources/mods/$m/" + #done + done +} + # Force 32-bit build and set the pkg-config path for mono.pc export AS="as -arch i386" export CC="gcc -arch i386 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk" @@ -43,6 +63,7 @@ mkbundle --deps --static -z -o OpenRA OpenRa.Game.exe OpenRa.Gl.dll OpenRa.FileF # Copy game files into our game bundle template cp -R packaging/osx/OpenRA.app . cp -R $GAME_FILES OpenRA.app/Contents/Resources/ +copy_mods # Copy frameworks into our game bundle template mkdir OpenRA.app/Contents/Frameworks/