Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 19:42:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[NativeMenu] Move files to the display subfolder.

Browse Source
This commit is contained in:
bruvzg 2024-03-26 10:18:08 +02:00
parent 7c6e85de0d
commit 399899a095
No known key found for this signature in database
GPG Key ID: 7960FCF39844EC38
8 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/macos/native_menu_macos.h
View File

@ -33,7 +33,7 @@
#include "core/templates/hash_map.h" #include "core/templates/hash_map.h"
#include "core/templates/rid_owner.h" #include "core/templates/rid_owner.h"
#include "servers/native_menu.h" #include "servers/display/native_menu.h"
#import <AppKit/AppKit.h> #import <AppKit/AppKit.h>
#import <ApplicationServices/ApplicationServices.h> #import <ApplicationServices/ApplicationServices.h>

2
platform/windows/native_menu_windows.h
View File

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

2
servers/SCsub
View File

@ -7,7 +7,6 @@ env.servers_sources = []
env.add_source_files(env.servers_sources, "audio_server.cpp") 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, "camera_server.cpp")
env.add_source_files(env.servers_sources, "display_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_2d.cpp")
env.add_source_files(env.servers_sources, "navigation_server_3d.cpp") env.add_source_files(env.servers_sources, "navigation_server_3d.cpp")
env.add_source_files(env.servers_sources, "physics_server_2d.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("audio/SCsub")
SConscript("camera/SCsub") SConscript("camera/SCsub")
SConscript("debugger/SCsub") SConscript("debugger/SCsub")
SConscript("display/SCsub")
SConscript("extensions/SCsub") SConscript("extensions/SCsub")
SConscript("movie_writer/SCsub") SConscript("movie_writer/SCsub")
SConscript("navigation/SCsub") SConscript("navigation/SCsub")

5
servers/display/SCsub Normal file
View File

@ -0,0 +1,5 @@
#!/usr/bin/env python
Import("env")
env.add_source_files(env.servers_sources, "*.cpp")

0
servers/native_menu.cpp → servers/display/native_menu.cpp
View File

0
servers/native_menu.h → servers/display/native_menu.h
View File

2
servers/display_server.h
View File

@ -36,7 +36,7 @@
#include "core/os/os.h" #include "core/os/os.h"
#include "core/variant/callable.h" #include "core/variant/callable.h"
#include "native_menu.h" #include "display/native_menu.h"
class Texture2D; class Texture2D;
class Image; class Image;

2
servers/register_server_types.cpp
View File

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