From: Rudolf Polzer <divVerent@gmail.com>
Date: Sat, 20 Nov 2021 19:08:29 +0000 (-0500)
Subject: Same sync for OS X.
X-Git-Tag: xonotic-v0.8.5~51
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0c0a244c76038d0b70d6db26b5ab9598524f7e04;p=xonotic%2Fxonotic.git

Same sync for OS X.

Note that OS X builds aren't made yet as I first need to actually bring up the cross compiler first.
---

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index a3eb2ac2..a6d30705 100644
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -292,8 +292,9 @@ case "$cmd" in
 		#verbose "$SELF" release-getbinary Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin || good=false
 		#verbose "$SELF" release-getbinary Xonotic/xonotic-osx-dedicated || good=false
 		#$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 i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I../../../.deps/include -L../../../.deps/lib -fno-reorder-blocks -DSUPPORTIPV6" DP_LINK_ZLIB=shared DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen' \
+			'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' \
 			'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated'
 		;;
 	release-engine-linux64)