Browse Source

Merge pull request #106348 from akien-mga/macos-fix-template_debug-build

macOS: Fix `template_debug` build after #105884
Rémi Verschelde 3 months ago
parent
commit
af62a09b42
2 changed files with 6 additions and 5 deletions
  1. 1 1
      platform/macos/display_server_macos.h
  2. 5 4
      platform/macos/display_server_macos.mm

+ 1 - 1
platform/macos/display_server_macos.h

@@ -460,7 +460,7 @@ public:
 	virtual bool get_swap_cancel_ok() override;
 	virtual bool get_swap_cancel_ok() override;
 
 
 	virtual void enable_for_stealing_focus(OS::ProcessID pid) override;
 	virtual void enable_for_stealing_focus(OS::ProcessID pid) override;
-#ifdef DEBUG_ENABLED
+#ifdef TOOLS_ENABLED
 	Error embed_process_update(WindowID p_window, const EmbeddedProcessMacOS *p_process);
 	Error embed_process_update(WindowID p_window, const EmbeddedProcessMacOS *p_process);
 #endif
 #endif
 	virtual Error request_close_embedded_process(OS::ProcessID p_pid) override;
 	virtual Error request_close_embedded_process(OS::ProcessID p_pid) override;

+ 5 - 4
platform/macos/display_server_macos.mm

@@ -30,9 +30,6 @@
 
 
 #import "display_server_macos.h"
 #import "display_server_macos.h"
 
 
-#ifdef DEBUG_ENABLED
-#import "editor/embedded_process_macos.h"
-#endif
 #import "godot_application.h"
 #import "godot_application.h"
 #import "godot_application_delegate.h"
 #import "godot_application_delegate.h"
 #import "godot_button_view.h"
 #import "godot_button_view.h"
@@ -56,6 +53,10 @@
 #include "main/main.h"
 #include "main/main.h"
 #include "scene/resources/image_texture.h"
 #include "scene/resources/image_texture.h"
 
 
+#ifdef TOOLS_ENABLED
+#import "editor/embedded_process_macos.h"
+#endif
+
 #include <AppKit/AppKit.h>
 #include <AppKit/AppKit.h>
 
 
 #include "servers/rendering/dummy/rasterizer_dummy.h"
 #include "servers/rendering/dummy/rasterizer_dummy.h"
@@ -3283,7 +3284,7 @@ void DisplayServerMacOS::enable_for_stealing_focus(OS::ProcessID pid) {
 		ERR_FAIL_V(m_retval);                        \
 		ERR_FAIL_V(m_retval);                        \
 	}
 	}
 
 
-#ifdef DEBUG_ENABLED
+#ifdef TOOLS_ENABLED
 
 
 Error DisplayServerMacOS::embed_process_update(WindowID p_window, const EmbeddedProcessMacOS *p_process) {
 Error DisplayServerMacOS::embed_process_update(WindowID p_window, const EmbeddedProcessMacOS *p_process) {
 	_THREAD_SAFE_METHOD_
 	_THREAD_SAFE_METHOD_