Issue #1905 - Part 2a - Build system fixes to allow use of SDK versioned 11.0 and higher. Also don't include code incompatible with SDK 10.15 and higher, when building with such a SDK.

This commit is contained in:
Brian Smith 2022-06-02 15:56:05 -05:00 committed by roytam1
commit 45606ffa59
3 changed files with 9 additions and 5 deletions

View file

@ -52,7 +52,7 @@ def main():
sdk_dir = xcode43_sdk_path
else:
sdk_dir = os.path.join(out.rstrip(), 'SDKs')
sdks = [re.findall('^MacOSX(10\.\d+)\.sdk$', s) for s in os.listdir(sdk_dir)]
sdks = [re.findall('^MacOSX(\d+\.\d+)\.sdk$', s) for s in os.listdir(sdk_dir)]
sdks = [s[0] for s in sdks if s] # [['10.5'], ['10.6']] => ['10.5', '10.6']
sdks = [s for s in sdks # ['10.5', '10.6'] => ['10.6']
if parse_version(s) >= parse_version(min_sdk_version)]

View file

@ -19,11 +19,12 @@ if sys.platform == 'darwin':
print("find_sdk_uxp.py: error: Specified path does not exist or is not a directory")
sys.exit(1)
KNOWN_SDK_VERSIONS = ["10.7", "10.8", "10.9", "10.10",
"10.11", "10.12", "10.13", "10.14",
"10.15"]
KNOWN_SDK_VERSIONS = ["10.7", "10.8", "10.9", "10.10", "10.11"
"10.12", "10.13", "10.14", "10.15", "10.16",
"11.0", "11.1", "11.2", "11.3",
"12.0"]
REGEX = "^MacOSX(10\.\d+)\.sdk$"
REGEX = "^MacOSX(\d+\.\d+)\.sdk$"
SDK_VERSION = re.findall(REGEX, os.path.basename(SDK_PATH))
if not SDK_VERSION:

View file

@ -209,6 +209,8 @@ uint32_t nsChildView::sLastInputEventCount = 0;
+ (BOOL)_shouldZoomOnDoubleClick; // present on 10.7 and above
@end
// This is only possible with SDKs below 10.15
#ifndef MAC_OS_X_VERSION_10_15
// Starting with 10.7 the bottom corners of all windows are rounded.
// Unfortunately, the standard rounding that OS X applies to OpenGL views
// does not use anti-aliasing and looks very crude. Since we want a smooth,
@ -226,6 +228,7 @@ uint32_t nsChildView::sLastInputEventCount = 0;
return region;
}
@end
#endif
#pragma mark -