Support latest Xcode

This commit is contained in:
Thomas Pöchtrager 2021-06-09 08:41:48 +02:00
parent 8a716a43a7
commit 1c23b94bad
3 changed files with 5 additions and 3 deletions

View File

@ -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.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.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; ;; 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 ;; *) echo "Unsupported SDK"; exit 1 ;;
esac esac

View File

@ -148,7 +148,7 @@ else
fi fi
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 if [ -z "$SDKS" ]; then
echo "No SDK found" 1>&2 echo "No SDK found" 1>&2

View File

@ -74,8 +74,9 @@ OSVersion Target::getSDKOSNum() const {
double n = atof(target.c_str() + 6); double n = atof(target.c_str() + 6);
if (n >= 20.0f) { if (n >= 20.0f) {
n = (((n - 20.0) * 10.0) - 1.0) + 0.1; int major = 11 + ((int)n % 20);
return OSVersion(11, (int)n); int minor = (((n - (int)n) * 10.0) - 1.0) + 0.1;
return OSVersion(major, minor);
} else { } else {
return OSVersion(10, (int)n - 4); return OSVersion(10, (int)n - 4);
} }