From 1c23b94bad4efc78d66ae917fa173c0d27bd2545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20P=C3=B6chtrager?= Date: Wed, 9 Jun 2021 08:41:48 +0200 Subject: [PATCH] Support latest Xcode --- build.sh | 1 + tools/gen_sdk_package.sh | 2 +- wrapper/target.cpp | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 24b6453..bbcff0c 100755 --- a/build.sh +++ b/build.sh @@ -44,6 +44,7 @@ case $SDK_VERSION in 11.1*) TARGET=darwin20.2; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;; 11.2*) TARGET=darwin20.3; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;; 11.3*) TARGET=darwin20.4; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;; + 12.0*) TARGET=darwin21.1; X86_64H_SUPPORTED=1; I386_SUPPORTED=0; ARM_SUPPORTED=1; NEED_TAPI_SUPPORT=1; OSX_VERSION_MIN_INT=10.9; ;; *) echo "Unsupported SDK"; exit 1 ;; esac diff --git a/tools/gen_sdk_package.sh b/tools/gen_sdk_package.sh index d9ca301..238a63f 100755 --- a/tools/gen_sdk_package.sh +++ b/tools/gen_sdk_package.sh @@ -148,7 +148,7 @@ else fi fi -SDKS=$(ls | grep -E "^MacOSX11.*|^MacOSX10.*" | grep -v "Patch") +SDKS=$(ls | grep -E "^MacOSX12.*|^MacOSX11.*|^MacOSX10.*" | grep -v "Patch") if [ -z "$SDKS" ]; then echo "No SDK found" 1>&2 diff --git a/wrapper/target.cpp b/wrapper/target.cpp index ff7f99b..82bf65c 100644 --- a/wrapper/target.cpp +++ b/wrapper/target.cpp @@ -74,8 +74,9 @@ OSVersion Target::getSDKOSNum() const { double n = atof(target.c_str() + 6); if (n >= 20.0f) { - n = (((n - 20.0) * 10.0) - 1.0) + 0.1; - return OSVersion(11, (int)n); + int major = 11 + ((int)n % 20); + int minor = (((n - (int)n) * 10.0) - 1.0) + 0.1; + return OSVersion(major, minor); } else { return OSVersion(10, (int)n - 4); }