]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
Re-enable macOS building using osxcross.
authorRudolf Polzer <divVerent@gmail.com>
Mon, 22 Nov 2021 19:05:53 +0000 (11:05 -0800)
committerRudolf Polzer <divVerent@gmail.com>
Mon, 22 Nov 2021 19:05:53 +0000 (11:05 -0800)
misc/tools/all/release.subr

index 00abb09b37e4545dfd5f4df171fe010bdfd6f109..5f4270bf438a9b7618cfb779f4ca0d4f83e9aa93 100644 (file)
@@ -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)