Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #117058 from bruvzg/mac_pre_26

Browse source 
[macOS] Fix building with Xcode versions older than 26.
This commit is contained in:
Thaddeus Crews 2026-03-04 11:20:46 -06:00
commit 1cbe90a1e9
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
platform/macos/display_server_macos_base.mm
View file

@ -164,11 +164,15 @@ bool DisplayServerMacOSBase::clipboard_has_image() const {
}
CGDirectDisplayID DisplayServerMacOSBase::_get_display_id_for_screen(NSScreen *p_screen) {
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 260000
if (@available(macOS 26.0, *)) {
return [p_screen CGDirectDisplayID];
} else {
return [[p_screen deviceDescription][@"NSScreenNumber"] unsignedIntValue];
}
#else
return [[p_screen deviceDescription][@"NSScreenNumber"] unsignedIntValue];
#endif
}
void DisplayServerMacOSBase::initialize_tts() const {