diff options
| author | Brian Smith <brian@dbsoft.org> | 2022-06-02 15:56:05 -0500 |
|---|---|---|
| committer | Brian Smith <brian@dbsoft.org> | 2022-06-02 15:56:05 -0500 |
| commit | 43dfe703daeed9661800f666be78ca33e3a6d01d (patch) | |
| tree | d6059bca7ee4116540d30d1a9ff9429dcb3021ef | |
| parent | 5e28396116a3a7817c6dbb6e52a7a2bb30f5a92a (diff) | |
| download | uxp-43dfe703daeed9661800f666be78ca33e3a6d01d.tar.gz | |
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.
| -rwxr-xr-x | media/webrtc/trunk/build/mac/find_sdk.py | 2 | ||||
| -rw-r--r-- | media/webrtc/trunk/build/mac/find_sdk_uxp.py | 9 | ||||
| -rw-r--r-- | widget/cocoa/nsChildView.mm | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/media/webrtc/trunk/build/mac/find_sdk.py b/media/webrtc/trunk/build/mac/find_sdk.py index ca58284eac..c26c3763c9 100755 --- a/media/webrtc/trunk/build/mac/find_sdk.py +++ b/media/webrtc/trunk/build/mac/find_sdk.py @@ -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)] diff --git a/media/webrtc/trunk/build/mac/find_sdk_uxp.py b/media/webrtc/trunk/build/mac/find_sdk_uxp.py index 3c419f1e45..a68e165f1a 100644 --- a/media/webrtc/trunk/build/mac/find_sdk_uxp.py +++ b/media/webrtc/trunk/build/mac/find_sdk_uxp.py @@ -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: diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 868687fe16..e2aa6729e9 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -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 - |