Skip to content

Commit af62a09

Browse files
committed
Merge pull request #106348 from akien-mga/macos-fix-template_debug-build
macOS: Fix `template_debug` build after #105884
2 parents 20f279c + 3e2c064 commit af62a09

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

platform/macos/display_server_macos.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ class DisplayServerMacOS : public DisplayServer {
460460
virtual bool get_swap_cancel_ok() override;
461461

462462
virtual void enable_for_stealing_focus(OS::ProcessID pid) override;
463-
#ifdef DEBUG_ENABLED
463+
#ifdef TOOLS_ENABLED
464464
Error embed_process_update(WindowID p_window, const EmbeddedProcessMacOS *p_process);
465465
#endif
466466
virtual Error request_close_embedded_process(OS::ProcessID p_pid) override;

platform/macos/display_server_macos.mm

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030

3131
#import "display_server_macos.h"
3232

33-
#ifdef DEBUG_ENABLED
34-
#import "editor/embedded_process_macos.h"
35-
#endif
3633
#import "godot_application.h"
3734
#import "godot_application_delegate.h"
3835
#import "godot_button_view.h"
@@ -56,6 +53,10 @@
5653
#include "main/main.h"
5754
#include "scene/resources/image_texture.h"
5855

56+
#ifdef TOOLS_ENABLED
57+
#import "editor/embedded_process_macos.h"
58+
#endif
59+
5960
#include <AppKit/AppKit.h>
6061

6162
#include "servers/rendering/dummy/rasterizer_dummy.h"
@@ -3283,7 +3284,7 @@
32833284
ERR_FAIL_V(m_retval); \
32843285
}
32853286

3286-
#ifdef DEBUG_ENABLED
3287+
#ifdef TOOLS_ENABLED
32873288

32883289
Error DisplayServerMacOS::embed_process_update(WindowID p_window, const EmbeddedProcessMacOS *p_process) {
32893290
_THREAD_SAFE_METHOD_

0 commit comments

Comments
 (0)