asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modules: Make sure to include modules_enabled.gen.h where needed

Browse source
This commit is contained in:
Rémi Verschelde 2021-11-12 13:42:58 +01:00
parent a54bd6e868
commit 88c4380737
No known key found for this signature in database
GPG key ID: C3336907360768E1
19 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
editor/doc_tools.cpp
View file

@ -41,7 +41,7 @@
#include "scene/resources/theme.h" #include "scene/resources/theme.h"
// Used for a hack preserving Mono properties on non-Mono builds. // Used for a hack preserving Mono properties on non-Mono builds.
#include "modules/modules_enabled.gen.h" #include "modules/modules_enabled.gen.h" // For mono.
void DocTools::merge_from(const DocTools &p_data) { void DocTools::merge_from(const DocTools &p_data) {
for (KeyValue<String, DocData::ClassDoc> &E : class_list) { for (KeyValue<String, DocData::ClassDoc> &E : class_list) {

2
editor/editor_themes.cpp
View file

@ -36,7 +36,7 @@
#include "editor_scale.h" #include "editor_scale.h"
#include "editor_settings.h" #include "editor_settings.h"
#include "modules/modules_enabled.gen.h" #include "modules/modules_enabled.gen.h" // For svg.
#ifdef MODULE_SVG_ENABLED #ifdef MODULE_SVG_ENABLED
#include "modules/svg/image_loader_svg.h" #include "modules/svg/image_loader_svg.h"
#endif #endif

6
editor/import/resource_importer_dynamicfont.cpp
View file

@ -30,12 +30,12 @@
#include "resource_importer_dynamicfont.h" #include "resource_importer_dynamicfont.h"
#include "dynamicfont_import_settings.h"
#include "core/io/file_access.h" #include "core/io/file_access.h"
#include "core/io/resource_saver.h" #include "core/io/resource_saver.h"
#include "dynamicfont_import_settings.h"
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "modules/modules_enabled.gen.h"
#include "modules/modules_enabled.gen.h" // For freetype.
String ResourceImporterDynamicFont::get_importer_name() const { String ResourceImporterDynamicFont::get_importer_name() const {
return "font_data_dynamic"; return "font_data_dynamic";

2
editor/plugin_config_dialog.cpp
View file

@ -38,7 +38,7 @@
#include "editor/project_settings_editor.h" #include "editor/project_settings_editor.h"
#include "scene/gui/grid_container.h" #include "scene/gui/grid_container.h"
#include "modules/modules_enabled.gen.h" #include "modules/modules_enabled.gen.h" // For gdscript.
#ifdef MODULE_GDSCRIPT_ENABLED #ifdef MODULE_GDSCRIPT_ENABLED
#include "modules/gdscript/gdscript.h" #include "modules/gdscript/gdscript.h"
#endif #endif

1
editor/rename_dialog.cpp
View file

@ -30,6 +30,7 @@
#include "rename_dialog.h" #include "rename_dialog.h"
#include "modules/modules_enabled.gen.h" // For regex.
#ifdef MODULE_REGEX_ENABLED #ifdef MODULE_REGEX_ENABLED
#include "core/string/print_string.h" #include "core/string/print_string.h"

7
editor/rename_dialog.h
View file

@ -31,17 +31,16 @@
#ifndef RENAME_DIALOG_H #ifndef RENAME_DIALOG_H
#define RENAME_DIALOG_H #define RENAME_DIALOG_H
#include "modules/modules_enabled.gen.h" #include "modules/modules_enabled.gen.h" // For regex.
#ifdef MODULE_REGEX_ENABLED #ifdef MODULE_REGEX_ENABLED
#include "core/object/undo_redo.h"
#include "editor/scene_tree_editor.h"
#include "scene/gui/check_box.h" #include "scene/gui/check_box.h"
#include "scene/gui/dialogs.h" #include "scene/gui/dialogs.h"
#include "scene/gui/option_button.h" #include "scene/gui/option_button.h"
#include "scene/gui/spin_box.h" #include "scene/gui/spin_box.h"
#include "core/object/undo_redo.h"
#include "editor/scene_tree_editor.h"
/** /**
@author Blazej Floch @author Blazej Floch
*/ */

2
editor/scene_tree_dock.cpp
View file

@ -52,6 +52,8 @@
#include "servers/display_server.h" #include "servers/display_server.h"
#include "servers/rendering_server.h" #include "servers/rendering_server.h"
#include "modules/modules_enabled.gen.h" // For regex.
void SceneTreeDock::_nodes_drag_begin() { void SceneTreeDock::_nodes_drag_begin() {
if (restore_script_editor_on_drag) { if (restore_script_editor_on_drag) {
EditorNode::get_singleton()->set_visible_editor(EditorNode::EDITOR_SCRIPT); EditorNode::get_singleton()->set_visible_editor(EditorNode::EDITOR_SCRIPT);

2
editor/scene_tree_dock.h
View file

@ -48,6 +48,8 @@
#include "scene/gui/tree.h" #include "scene/gui/tree.h"
#include "scene_tree_editor.h" #include "scene_tree_editor.h"
#include "modules/modules_enabled.gen.h" // For regex.
class EditorNode; class EditorNode;
class ShaderCreateDialog; class ShaderCreateDialog;

5
main/main.cpp
View file

@ -57,7 +57,6 @@
#include "main/performance.h" #include "main/performance.h"
#include "main/splash.gen.h" #include "main/splash.gen.h"
#include "main/splash_editor.gen.h" #include "main/splash_editor.gen.h"
#include "modules/modules_enabled.gen.h"
#include "modules/register_module_types.h" #include "modules/register_module_types.h"
#include "platform/register_platform_apis.h" #include "platform/register_platform_apis.h"
#include "scene/main/scene_tree.h" #include "scene/main/scene_tree.h"
@ -81,16 +80,16 @@
#endif #endif
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
#include "editor/doc_data_class_path.gen.h" #include "editor/doc_data_class_path.gen.h"
#include "editor/doc_tools.h" #include "editor/doc_tools.h"
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
#include "editor/progress_dialog.h" #include "editor/progress_dialog.h"
#include "editor/project_manager.h" #include "editor/project_manager.h"
#endif #endif
#include "modules/modules_enabled.gen.h" // For mono.
/* Static members */ /* Static members */
// Singletons // Singletons

2
modules/gdscript/language_server/gdscript_language_protocol.h
View file

@ -38,7 +38,7 @@
#include "gdscript_workspace.h" #include "gdscript_workspace.h"
#include "lsp.hpp" #include "lsp.hpp"
#include "modules/modules_enabled.gen.h" #include "modules/modules_enabled.gen.h" // For jsonrpc.
#ifdef MODULE_JSONRPC_ENABLED #ifdef MODULE_JSONRPC_ENABLED
#include "modules/jsonrpc/jsonrpc.h" #include "modules/jsonrpc/jsonrpc.h"
#else #else

2
modules/gltf/gltf_document.cpp
View file

@ -68,7 +68,7 @@
#include "scene/resources/multimesh.h" #include "scene/resources/multimesh.h"
#include "scene/resources/surface_tool.h" #include "scene/resources/surface_tool.h"
#include "modules/modules_enabled.gen.h" #include "modules/modules_enabled.gen.h" // For csg, gridmap.
#ifdef MODULE_CSG_ENABLED #ifdef MODULE_CSG_ENABLED
#include "modules/csg/csg_shape.h" #include "modules/csg/csg_shape.h"

3
modules/gltf/gltf_document.h
View file

@ -46,7 +46,8 @@
#include "scene/resources/material.h" #include "scene/resources/material.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "modules/modules_enabled.gen.h" #include "modules/modules_enabled.gen.h" // For csg, gridmap.
#include <cstdint> #include <cstdint>
class GLTFState; class GLTFState;

3
modules/navigation/navigation_mesh_generator.cpp
View file

@ -52,7 +52,8 @@
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
#endif #endif
#include "modules/modules_enabled.gen.h" #include "modules/modules_enabled.gen.h" // For csg, gridmap.
#ifdef MODULE_CSG_ENABLED #ifdef MODULE_CSG_ENABLED
#include "modules/csg/csg_shape.h" #include "modules/csg/csg_shape.h"
#endif #endif

2
modules/text_server_adv/text_server_adv.cpp
View file

@ -38,6 +38,8 @@
#include "thirdparty/icu4c/icudata.gen.h" #include "thirdparty/icu4c/icudata.gen.h"
#endif #endif
#include "modules/modules_enabled.gen.h" // For freetype, msdfgen.
#ifdef MODULE_MSDFGEN_ENABLED #ifdef MODULE_MSDFGEN_ENABLED
#include "core/ShapeDistanceFinder.h" #include "core/ShapeDistanceFinder.h"
#include "core/contour-combiners.h" #include "core/contour-combiners.h"

2
modules/text_server_adv/text_server_adv.h
View file

@ -55,7 +55,7 @@
#include <unicode/ustring.h> #include <unicode/ustring.h>
#include <unicode/utypes.h> #include <unicode/utypes.h>
#include "modules/modules_enabled.gen.h" #include "modules/modules_enabled.gen.h" // For freetype, msdfgen.
#ifdef MODULE_FREETYPE_ENABLED #ifdef MODULE_FREETYPE_ENABLED
#include <ft2build.h> #include <ft2build.h>

2
modules/text_server_fb/text_server_fb.cpp
View file

@ -33,6 +33,8 @@
#include "core/error/error_macros.h" #include "core/error/error_macros.h"
#include "core/string/print_string.h" #include "core/string/print_string.h"
#include "modules/modules_enabled.gen.h" // For freetype, msdfgen.
#ifdef MODULE_MSDFGEN_ENABLED #ifdef MODULE_MSDFGEN_ENABLED
#include "core/ShapeDistanceFinder.h" #include "core/ShapeDistanceFinder.h"
#include "core/contour-combiners.h" #include "core/contour-combiners.h"

2
modules/text_server_fb/text_server_fb.h
View file

@ -42,7 +42,7 @@
#include "core/templates/thread_work_pool.h" #include "core/templates/thread_work_pool.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "modules/modules_enabled.gen.h" #include "modules/modules_enabled.gen.h" // For freetype, msdfgen.
#ifdef MODULE_FREETYPE_ENABLED #ifdef MODULE_FREETYPE_ENABLED
#include <ft2build.h> #include <ft2build.h>

2
platform/javascript/os_javascript.cpp
View file

@ -36,7 +36,7 @@
#include "main/main.h" #include "main/main.h"
#include "platform/javascript/display_server_javascript.h" #include "platform/javascript/display_server_javascript.h"
#include "modules/modules_enabled.gen.h" #include "modules/modules_enabled.gen.h" // For websocket.
#ifdef MODULE_WEBSOCKET_ENABLED #ifdef MODULE_WEBSOCKET_ENABLED
#include "modules/websocket/remote_debugger_peer_websocket.h" #include "modules/websocket/remote_debugger_peer_websocket.h"
#endif #endif

2
scene/gui/rich_text_label.cpp
View file

@ -36,7 +36,7 @@
#include "scene/scene_string_names.h" #include "scene/scene_string_names.h"
#include "servers/display_server.h" #include "servers/display_server.h"
#include "modules/modules_enabled.gen.h" #include "modules/modules_enabled.gen.h" // For regex.
#ifdef MODULE_REGEX_ENABLED #ifdef MODULE_REGEX_ENABLED
#include "modules/regex/regex.h" #include "modules/regex/regex.h"
#endif #endif