From: tobtoht Date: Wed, 9 Apr 2025 18:01:40 +0000 (+0200) Subject: build: bump minimum macos to 12.0 X-Git-Url: https://git.nutra.tk/v1?a=commitdiff_plain;h=2301f6817615e576c7cee6d2b0ba402e6bb42056;p=gamesguru%2Ffeather.git build: bump minimum macos to 12.0 --- diff --git a/contrib/depends/hosts/darwin.mk b/contrib/depends/hosts/darwin.mk index 7517dcc5..ee4ce01e 100644 --- a/contrib/depends/hosts/darwin.mk +++ b/contrib/depends/hosts/darwin.mk @@ -1,5 +1,5 @@ -OSX_MIN_VERSION=11.0 -OSX_SDK_VERSION=11.0 +OSX_MIN_VERSION=12.0 +OSX_SDK_VERSION=12.0 XCODE_VERSION=12.2 XCODE_BUILD_ID=12B45b LD64_VERSION=711 diff --git a/contrib/depends/packages/qt.mk b/contrib/depends/packages/qt.mk index ef30b28e..4b68edf9 100644 --- a/contrib/depends/packages/qt.mk +++ b/contrib/depends/packages/qt.mk @@ -163,7 +163,7 @@ $(package)_config_opts_darwin += -DQT_FEATURE_accessibility=OFF $(package)_config_opts_darwin += -DQT_FEATURE_dbus=OFF $(package)_config_opts_darwin += -DQT_FEATURE_freetype=OFF $(package)_config_opts_darwin += -DQT_FEATURE_ffmpeg=OFF -$(package)_config_opts_darwin += -DQMAKE_MACOSX_DEPLOYMENT_TARGET=11.0 +$(package)_config_opts_darwin += -DQMAKE_MACOSX_DEPLOYMENT_TARGET=12.0 $(package)_config_opts_darwin += -DBUILD_WITH_PCH=OFF $(package)_config_opts_darwin += '-DQT_QMAKE_DEVICE_OPTIONS=MAC_SDK_PATH=$(host_prefix)/native/SDK;MAC_SDK_VERSION=$(OSX_SDK_VERSION);CROSS_COMPILE=$(host)-;MAC_TARGET=$(host);XCODE_VERSION=$(XCODE_VERSION)' $(package)_config_opts_darwin += -DQT_NO_APPLE_SDK_AND_XCODE_CHECK=ON diff --git a/contrib/depends/patches/qt/toolchain.cmake b/contrib/depends/patches/qt/toolchain.cmake index 896a147c..a2bcc7e1 100644 --- a/contrib/depends/patches/qt/toolchain.cmake +++ b/contrib/depends/patches/qt/toolchain.cmake @@ -30,7 +30,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") set(CMAKE_EXE_LINKER_FLAGS "@cmake_ld_flags@") set(CMAKE_MODULE_LINKER_FLAGS "@cmake_ld_flags@") set(CMAKE_SHARED_LINKER_FLAGS "@cmake_ld_flags@") - SET(CMAKE_OSX_DEPLOYMENT_TARGET "11.0") + SET(CMAKE_OSX_DEPLOYMENT_TARGET "12.0") set(CMAKE_INSTALL_NAME_TOOL @target@-install_name_tool) endif() \ No newline at end of file diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index c072a4c6..193f6939 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -94,7 +94,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") SET(BUILD_TAG "mac-x64") SET(CMAKE_OSX_ARCHITECTURES "x86_64") endif() - SET(CMAKE_SYSTEM_VERSION 20.1) + SET(CMAKE_SYSTEM_VERSION 21.0.1) SET(_CMAKE_TOOLCHAIN_PREFIX @prefix@/native/bin/${CONF_TRIPLE}-) SET(CMAKE_C_COMPILER @CC@) SET(CMAKE_C_COMPILER_TARGET ${CLANG_TARGET}) @@ -116,7 +116,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") SET(BREW OFF) SET(PORT OFF) SET(CMAKE_OSX_SYSROOT "@prefix@/native/SDK") - SET(CMAKE_OSX_DEPLOYMENT_TARGET "11.0") + SET(CMAKE_OSX_DEPLOYMENT_TARGET "12.0") SET(CMAKE_CXX_STANDARD 17) else() SET(CMAKE_C_COMPILER @CC@) diff --git a/contrib/macdeploy/Info.plist.in b/contrib/macdeploy/Info.plist.in index 56777971..c89f3a6b 100644 --- a/contrib/macdeploy/Info.plist.in +++ b/contrib/macdeploy/Info.plist.in @@ -3,7 +3,7 @@ LSMinimumSystemVersion - 11 + 12 LSArchitecturePriority