]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
Increase minimum Mac OS X version to 10.7
authorbones_was_here <bones_was_here@xonotic.au>
Mon, 25 Dec 2023 15:12:11 +0000 (01:12 +1000)
committerbones_was_here <bones_was_here@xonotic.au>
Mon, 25 Dec 2023 15:20:23 +0000 (01:20 +1000)
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
misc/tools/all/release.subr

index 26d21e4dd8b066d1f8adf3517fef6e6e181d4a4c..a407e1eb9ec277f556f3bd9938e9ae58af3d9a2e 100644 (file)
@@ -21,7 +21,7 @@
        <key>LSMinimumSystemVersionByArchitecture</key>
        <dict>
                <key>x86_64</key>
-               <string>10.6.0</string>
+               <string>10.7.0</string>
        </dict>
 </dict>
 </plist>
index 0f1c96d43c50e89534e54af06157b8456b060d9a..28bed3b437849896717926de1a630e1f3ab8692c 100644 (file)
@@ -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)