From 8eb3964e92ce41dd8cc373bb17b6398733290948 Mon Sep 17 00:00:00 2001 From: bones_was_here Date: Tue, 26 Dec 2023 01:12:11 +1000 Subject: [PATCH] Increase minimum Mac OS X version to 10.7 This is the minimum for building with SDL 2.28.5 Even so, ld: warning: dylib (../../../.deps/SDL2.framework/SDL2) was built for newer macOS version (10.11) than being linked (10.7) --- misc/buildfiles/osx/Xonotic.app/Contents/Info.plist | 2 +- misc/tools/all/release.subr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/Info.plist b/misc/buildfiles/osx/Xonotic.app/Contents/Info.plist index 26d21e4d..a407e1eb 100644 --- a/misc/buildfiles/osx/Xonotic.app/Contents/Info.plist +++ b/misc/buildfiles/osx/Xonotic.app/Contents/Info.plist @@ -21,7 +21,7 @@ LSMinimumSystemVersionByArchitecture x86_64 - 10.6.0 + 10.7.0 diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr index 0f1c96d4..28bed3b4 100644 --- a/misc/tools/all/release.subr +++ b/misc/tools/all/release.subr @@ -378,7 +378,7 @@ case "$cmd" in # Note: travis build script also had SDLCONFIG_MACOSX* flags; need to check if they're still needed with osxcross. # Note: Mac bins cannot be stripped by the standard tool. verbose "$SELF" release-compile osx \ - 'STRIP=: DP_MAKE_TARGET=macosx PATH="$HOME/osxcross/out/bin:$PATH" CC="$HOME/osxcross/out/bin/o64-clang -flto -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" SDLCONFIG_MACOSXCFLAGS="-I../../../.deps/SDL2.framework/Headers" SDLCONFIG_MACOSXLIBS="-F../../../.deps -framework SDL2 -framework Cocoa -I../../../.deps/SDL2.framework/Headers" SDLCONFIG_MACOSXSTATICLIBS="-F../../../.deps -framework SDL2 -framework Cocoa -I../../../.deps/SDL2.framework/Headers" DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_ZLIB=shared' \ + 'STRIP=: DP_MAKE_TARGET=macosx PATH="$HOME/osxcross/out/bin:$PATH" CC="$HOME/osxcross/out/bin/o64-clang -flto -arch x86_64 -mmacosx-version-min=10.7 -Wl,-rpath -Wl,@loader_path/../Frameworks -Wl,-rpath -Wl,@loader_path -I../../../.deps/include -L../../../.deps/lib" SDLCONFIG_MACOSXCFLAGS="-I../../../.deps/SDL2.framework/Headers" SDLCONFIG_MACOSXLIBS="-F../../../.deps -framework SDL2 -framework Cocoa -I../../../.deps/SDL2.framework/Headers" SDLCONFIG_MACOSXSTATICLIBS="-F../../../.deps -framework SDL2 -framework Cocoa -I../../../.deps/SDL2.framework/Headers" DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_ZLIB=shared' \ release 'darkplaces-sdl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated' ;; release-engine-linux64) -- 2.39.2