seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #106383 from bruvzg/macos_isdef

Browse Source 
Fix macOS build with `dev_build=yes` and `target=template_debug`
This commit is contained in:
Thaddeus Crews
2025-05-14 09:44:12 -05:00
parent 006b986fbb dfb2bc5f7e
commit ae68a216b9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/macos/godot_application.mm
View File

@ -63,11 +63,14 @@ GodotApplication *GodotApp = nil;
NSString *nsbundleid_env = [NSString stringWithUTF8String:(bundled_id != nullptr) ? bundled_id : ""];
NSString *nsbundleid = [[NSBundle mainBundle] bundleIdentifier];
if (nsappname == nil || isatty(STDOUT_FILENO) || isatty(STDIN_FILENO) || isatty(STDERR_FILENO) || ![nsbundleid isEqualToString:nsbundleid_env]) {
#if DEV_ENABLED
if (!OS_MacOS::is_debugger_attached())
#ifdef TOOLS_ENABLED
if (!OS_MacOS::is_debugger_attached()) {
#else
{
#endif
// If the executable is started from terminal or is not bundled, macOS WindowServer won't register and activate app window correctly (menu and title bar are grayed out and input ignored).
[self performSelector:@selector(forceUnbundledWindowActivationHackStep1) withObject:nil afterDelay:0.02];
}
}
}