Merge pull request godotengine#89900 from bruvzg/nmenu_move

[NativeMenu] Move files to the `display` subfolder.
ybin64 · Mar 26, 2024 · bad1f4a · bad1f4a
2 parents aed1775 + 399899a
commit bad1f4a
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 5 deletions.
diff --git a/platform/macos/native_menu_macos.h b/platform/macos/native_menu_macos.h
@@ -33,7 +33,7 @@
 
 #include "core/templates/hash_map.h"
 #include "core/templates/rid_owner.h"
-#include "servers/native_menu.h"
+#include "servers/display/native_menu.h"
 
 #import <AppKit/AppKit.h>
 #import <ApplicationServices/ApplicationServices.h>

diff --git a/platform/windows/native_menu_windows.h b/platform/windows/native_menu_windows.h
@@ -33,7 +33,7 @@
 
 #include "core/templates/hash_map.h"
 #include "core/templates/rid_owner.h"
-#include "servers/native_menu.h"
+#include "servers/display/native_menu.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>

diff --git a/servers/SCsub b/servers/SCsub
@@ -7,7 +7,6 @@ env.servers_sources = []
 env.add_source_files(env.servers_sources, "audio_server.cpp")
 env.add_source_files(env.servers_sources, "camera_server.cpp")
 env.add_source_files(env.servers_sources, "display_server.cpp")
-env.add_source_files(env.servers_sources, "native_menu.cpp")
 env.add_source_files(env.servers_sources, "navigation_server_2d.cpp")
 env.add_source_files(env.servers_sources, "navigation_server_3d.cpp")
 env.add_source_files(env.servers_sources, "physics_server_2d.cpp")
@@ -19,6 +18,7 @@ env.add_source_files(env.servers_sources, "text_server.cpp")
 SConscript("audio/SCsub")
 SConscript("camera/SCsub")
 SConscript("debugger/SCsub")
+SConscript("display/SCsub")
 SConscript("extensions/SCsub")
 SConscript("movie_writer/SCsub")
 SConscript("navigation/SCsub")

diff --git a/servers/display/SCsub b/servers/display/SCsub
@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+
+Import("env")
+
+env.add_source_files(env.servers_sources, "*.cpp")
diff --git a/servers/native_menu.cpp → servers/display/native_menu.cpp b/servers/native_menu.cpp → servers/display/native_menu.cpp
diff --git a/servers/native_menu.h → servers/display/native_menu.h b/servers/native_menu.h → servers/display/native_menu.h
diff --git a/servers/display_server.h b/servers/display_server.h
@@ -36,7 +36,7 @@
 #include "core/os/os.h"
 #include "core/variant/callable.h"
 
-#include "native_menu.h"
+#include "display/native_menu.h"
 
 class Texture2D;
 class Image;

diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp
@@ -57,11 +57,11 @@
 #include "camera/camera_feed.h"
 #include "camera_server.h"
 #include "debugger/servers_debugger.h"
+#include "display/native_menu.h"
 #include "display_server.h"
 #include "movie_writer/movie_writer.h"
 #include "movie_writer/movie_writer_mjpeg.h"
 #include "movie_writer/movie_writer_pngwav.h"
-#include "native_menu.h"
 #include "rendering/renderer_compositor.h"
 #include "rendering/renderer_rd/framebuffer_cache_rd.h"
 #include "rendering/renderer_rd/storage_rd/render_data_rd.h"