diff --git a/Makefile b/Makefile index fc3292095c..c63b5ae725 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ WHITELISTED_OPENRA_ASSEMBLIES = $(game_TARGET) $(utility_TARGET) $(pdefault_TARG WHITELISTED_THIRDPARTY_ASSEMBLIES = ICSharpCode.SharpZipLib.dll FuzzyLogicLibrary.dll MaxMind.Db.dll Eluant.dll rix0rrr.BeaconLib.dll Open.Nat.dll SDL2-CS.dll OpenAL-CS.dll # These are shipped in our custom minimal mono runtime and also available in the full system-installed .NET/mono stack -# This list *must* be kept in sync with the files packaged by the AppImageSupport repository +# This list *must* be kept in sync with the files packaged by the AppImageSupport and OpenRALauncherOSX repositories WHITELISTED_CORE_ASSEMBLIES = mscorlib.dll System.dll System.Configuration.dll System.Core.dll System.Numerics.dll System.Security.dll System.Xml.dll Mono.Security.dll NUNIT_LIBS_PATH := diff --git a/OpenRA.Platforms.Default.dll.config b/OpenRA.Platforms.Default.dll.config index c216adda32..32a7cfd944 100644 --- a/OpenRA.Platforms.Default.dll.config +++ b/OpenRA.Platforms.Default.dll.config @@ -1,6 +1,6 @@ - + diff --git a/packaging/osx/buildpackage.sh b/packaging/osx/buildpackage.sh index 35bd52612d..49a41b83b8 100755 --- a/packaging/osx/buildpackage.sh +++ b/packaging/osx/buildpackage.sh @@ -9,7 +9,7 @@ if [[ "$OSTYPE" != "darwin"* ]]; then command -v genisoimage >/dev/null 2>&1 || { echo >&2 "macOS packaging requires genisoimage."; exit 1; } fi -LAUNCHER_TAG="osx-launcher-20171118" +LAUNCHER_TAG="osx-launcher-20190317" if [ $# -ne "2" ]; then echo "Usage: $(basename "$0") tag outputdir" diff --git a/thirdparty/fetch-thirdparty-deps-osx.sh b/thirdparty/fetch-thirdparty-deps-osx.sh index 9c5f9e7eac..b2f5a76267 100755 --- a/thirdparty/fetch-thirdparty-deps-osx.sh +++ b/thirdparty/fetch-thirdparty-deps-osx.sh @@ -1,6 +1,6 @@ #!/bin/bash -LAUNCHER_TAG="osx-launcher-20171118" +LAUNCHER_TAG="osx-launcher-20190317" download_dir="${0%/*}/download/osx" mkdir -p "$download_dir" @@ -18,5 +18,10 @@ fi if [ ! -f Eluant.dll.config ]; then echo "Fetching OS X Lua configuration file from GitHub." - curl -LOs https://raw.githubusercontent.com/OpenRA/OpenRALauncherOSX/${LAUNCHER_TAG}/dependencies/Eluant.dll.config + curl -LOs https://raw.githubusercontent.com/OpenRA/OpenRALauncherOSX/${LAUNCHER_TAG}/Eluant.dll.config +fi + +if [ ! -f libfreetype.6.dylib ]; then + echo "Fetching OS X FreeType library from GitHub." + curl -LOs https://github.com/OpenRA/OpenRALauncherOSX/releases/download/${LAUNCHER_TAG}/libfreetype.6.dylib fi