From 73b338e91833e89cd7ef060fc05db5f58b98ca1c Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 22 Nov 2021 11:05:53 -0800 Subject: [PATCH] Re-enable macOS building using osxcross. --- misc/tools/all/release.subr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr index 00abb09b..5f4270bf 100644 --- a/misc/tools/all/release.subr +++ b/misc/tools/all/release.subr @@ -293,7 +293,7 @@ case "$cmd" in #$good # Note: travis build script also had SDLCONFIG_MACOSX* flags; need to check if they're still needed with osxcross. verbose "$SELF" release-compile osx \ - 'STRIP=: CC="gcc -g1 -arch x86_64 -mmacosx-version-min=10.6 -Wl,-rpath -Wl,@loader_path/../Frameworks -Wl,-rpath -Wl,@loader_path -I../../../.deps/include -L../../../.deps/lib -DSUPPORTIPV6" DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_ZLIB=shared' \ + 'STRIP=: CC="$HOME/osxcross/out/bin/o64-clang -g1 -arch x86_64 -mmacosx-version-min=10.6 -Wl,-rpath -Wl,@loader_path/../Frameworks -Wl,-rpath -Wl,@loader_path -I../../../.deps/include -L../../../.deps/lib -DSUPPORTIPV6" DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_ZLIB=shared' \ 'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated' ;; release-engine-linux64) @@ -314,7 +314,7 @@ case "$cmd" in verbose "$SELF" release-engine-linux64 && good=true verbose "$SELF" release-engine-win32 && good=true verbose "$SELF" release-engine-win64 && good=true - #verbose "$SELF" release-engine-osx && good=true + verbose "$SELF" release-engine-osx && good=true $good ;; release-maps) -- 2.39.2