Use modules_enabled.gen.h to improve inter dependency checks

- Fix build with gdscript module disabled. Fixes #31011.
- Remove unused `gdscript` compile option.
- Fix build with regex module disabled.
- Fix ImageLoaderSVG to forward declare thirdparty structs.

(cherry picked from commit f3726ee994)
This commit is contained in:
Rémi Verschelde 2020-02-06 21:51:36 +01:00
parent cbbea6084d
commit 875045adde
No known key found for this signature in database
GPG Key ID: C3336907360768E1
13 changed files with 48 additions and 35 deletions

View File

@ -125,7 +125,6 @@ opts.Add(BoolVariable("use_lto", "Use link-time optimization", False))
# Components # Components
opts.Add(BoolVariable("deprecated", "Enable deprecated features", True)) opts.Add(BoolVariable("deprecated", "Enable deprecated features", True))
opts.Add(BoolVariable("gdscript", "Enable GDScript support", True))
opts.Add(BoolVariable("minizip", "Enable ZIP archive support using minizip", True)) opts.Add(BoolVariable("minizip", "Enable ZIP archive support using minizip", True))
opts.Add(BoolVariable("xaudio2", "Enable the XAudio2 audio driver", False)) opts.Add(BoolVariable("xaudio2", "Enable the XAudio2 audio driver", False))
opts.Add("custom_modules", "A list of comma-separated directory paths containing custom modules to build.", "") opts.Add("custom_modules", "A list of comma-separated directory paths containing custom modules to build.", "")
@ -575,8 +574,6 @@ if selected_platform in platform_list:
sys.exit(255) sys.exit(255)
else: else:
env.Append(CPPDEFINES=["_3D_DISABLED"]) env.Append(CPPDEFINES=["_3D_DISABLED"])
if env["gdscript"]:
env.Append(CPPDEFINES=["GDSCRIPT_ENABLED"])
if env["disable_advanced_gui"]: if env["disable_advanced_gui"]:
if env["tools"]: if env["tools"]:
print( print(

View File

@ -36,7 +36,8 @@
#include "editor_scale.h" #include "editor_scale.h"
#include "editor_settings.h" #include "editor_settings.h"
#ifdef SVG_ENABLED #include "modules/modules_enabled.gen.h"
#ifdef MODULE_SVG_ENABLED
#include "modules/svg/image_loader_svg.h" #include "modules/svg/image_loader_svg.h"
#endif #endif
@ -104,7 +105,7 @@ static Ref<Texture> flip_icon(Ref<Texture> p_texture, bool p_flip_y = false, boo
return texture; return texture;
} }
#ifdef SVG_ENABLED #ifdef MODULE_SVG_ENABLED
static Ref<ImageTexture> editor_generate_icon(int p_index, bool p_convert_color, float p_scale = EDSCALE, bool p_force_filter = false) { static Ref<ImageTexture> editor_generate_icon(int p_index, bool p_convert_color, float p_scale = EDSCALE, bool p_force_filter = false) {
Ref<ImageTexture> icon = memnew(ImageTexture); Ref<ImageTexture> icon = memnew(ImageTexture);
Ref<Image> img = memnew(Image); Ref<Image> img = memnew(Image);
@ -133,7 +134,7 @@ static Ref<ImageTexture> editor_generate_icon(int p_index, bool p_convert_color,
#endif #endif
void editor_register_and_generate_icons(Ref<Theme> p_theme, bool p_dark_theme = true, int p_thumb_size = 32, bool p_only_thumbs = false) { void editor_register_and_generate_icons(Ref<Theme> p_theme, bool p_dark_theme = true, int p_thumb_size = 32, bool p_only_thumbs = false) {
#ifdef SVG_ENABLED #ifdef MODULE_SVG_ENABLED
// The default icon theme is designed to be used for a dark theme. // The default icon theme is designed to be used for a dark theme.
// This dictionary stores color codes to convert to other colors // This dictionary stores color codes to convert to other colors
// for better readability on a light theme. // for better readability on a light theme.
@ -1383,7 +1384,7 @@ Ref<Theme> create_custom_theme(const Ref<Theme> p_theme) {
} }
Ref<ImageTexture> create_unscaled_default_project_icon() { Ref<ImageTexture> create_unscaled_default_project_icon() {
#ifdef SVG_ENABLED #ifdef MODULE_SVG_ENABLED
for (int i = 0; i < editor_icons_count; i++) { for (int i = 0; i < editor_icons_count; i++) {
// ESCALE should never affect size of the icon // ESCALE should never affect size of the icon
if (strcmp(editor_icons_names[i], "DefaultProjectIcon") == 0) { if (strcmp(editor_icons_names[i], "DefaultProjectIcon") == 0) {

View File

@ -37,7 +37,8 @@
#include "editor/project_settings_editor.h" #include "editor/project_settings_editor.h"
#include "scene/gui/grid_container.h" #include "scene/gui/grid_container.h"
#ifdef GDSCRIPT_ENABLED #include "modules/modules_enabled.gen.h"
#ifdef MODULE_GDSCRIPT_ENABLED
#include "modules/gdscript/gdscript.h" #include "modules/gdscript/gdscript.h"
#endif #endif
@ -78,7 +79,9 @@ void PluginConfigDialog::_on_confirmed() {
// TODO Use script templates. Right now, this code won't add the 'tool' annotation to other languages. // TODO Use script templates. Right now, this code won't add the 'tool' annotation to other languages.
// TODO Better support script languages with named classes (has_named_classes). // TODO Better support script languages with named classes (has_named_classes).
#ifdef GDSCRIPT_ENABLED // FIXME: It's hacky to have hardcoded access to the GDScript module here.
// The editor code should not have to know what languages are enabled.
#ifdef MODULE_GDSCRIPT_ENABLED
if (lang_name == GDScriptLanguage::get_singleton()->get_name()) { if (lang_name == GDScriptLanguage::get_singleton()->get_name()) {
// Hard-coded GDScript template to keep usability until we use script templates. // Hard-coded GDScript template to keep usability until we use script templates.
Ref<Script> gdscript = memnew(GDScript); Ref<Script> gdscript = memnew(GDScript);
@ -105,7 +108,7 @@ void PluginConfigDialog::_on_confirmed() {
script = ScriptServer::get_language(lang_idx)->get_template(class_name, "EditorPlugin"); script = ScriptServer::get_language(lang_idx)->get_template(class_name, "EditorPlugin");
script->set_path(script_path); script->set_path(script_path);
ResourceSaver::save(script_path, script); ResourceSaver::save(script_path, script);
#ifdef GDSCRIPT_ENABLED #ifdef MODULE_GDSCRIPT_ENABLED
} }
#endif #endif
@ -237,7 +240,7 @@ PluginConfigDialog::PluginConfigDialog() {
for (int i = 0; i < ScriptServer::get_language_count(); i++) { for (int i = 0; i < ScriptServer::get_language_count(); i++) {
ScriptLanguage *lang = ScriptServer::get_language(i); ScriptLanguage *lang = ScriptServer::get_language(i);
script_option_edit->add_item(lang->get_name()); script_option_edit->add_item(lang->get_name());
#ifdef GDSCRIPT_ENABLED #ifdef MODULE_GDSCRIPT_ENABLED
if (lang == GDScriptLanguage::get_singleton()) { if (lang == GDScriptLanguage::get_singleton()) {
default_lang = i; default_lang = i;
} }

View File

@ -34,7 +34,8 @@
#include "core/os/main_loop.h" #include "core/os/main_loop.h"
#include "core/os/os.h" #include "core/os/os.h"
#ifdef GDSCRIPT_ENABLED #include "modules/modules_enabled.gen.h"
#ifdef MODULE_GDSCRIPT_ENABLED
#include "modules/gdscript/gdscript.h" #include "modules/gdscript/gdscript.h"
#include "modules/gdscript/gdscript_compiler.h" #include "modules/gdscript/gdscript_compiler.h"
@ -1024,6 +1025,7 @@ MainLoop *test(TestType p_type) {
namespace TestGDScript { namespace TestGDScript {
MainLoop *test(TestType p_type) { MainLoop *test(TestType p_type) {
ERR_PRINT("The GDScript module is disabled, therefore GDScript tests cannot be used.");
return NULL; return NULL;
} }
} // namespace TestGDScript } // namespace TestGDScript

View File

@ -28,15 +28,19 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "core/ustring.h" #include "test_string.h"
#include <wchar.h>
//#include "core/math/math_funcs.h"
#include "core/io/ip_address.h" #include "core/io/ip_address.h"
#include "core/os/os.h" #include "core/os/os.h"
#include "modules/regex/regex.h" #include "core/ustring.h"
#include <stdio.h>
#include "test_string.h" #include "modules/modules_enabled.gen.h"
#ifdef MODULE_REGEX_ENABLED
#include "modules/regex/regex.h"
#endif
#include <stdio.h>
#include <wchar.h>
namespace TestString { namespace TestString {

View File

@ -112,8 +112,5 @@ module_obj = []
env_freetype.add_source_files(module_obj, "*.cpp") env_freetype.add_source_files(module_obj, "*.cpp")
env.modules_sources += module_obj env.modules_sources += module_obj
# Used in scene/, needs to be in main env
env.Append(CPPDEFINES=["FREETYPE_ENABLED"])
# Needed to force rebuilding the module files when the thirdparty library is updated. # Needed to force rebuilding the module files when the thirdparty library is updated.
env.Depends(module_obj, thirdparty_obj) env.Depends(module_obj, thirdparty_obj)

View File

@ -29,6 +29,7 @@
/*************************************************************************/ /*************************************************************************/
#include "navigation_mesh_generator.h" #include "navigation_mesh_generator.h"
#include "core/math/convex_hull.h" #include "core/math/convex_hull.h"
#include "core/os/thread.h" #include "core/os/thread.h"
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
@ -45,10 +46,10 @@
#include "scene/resources/shape.h" #include "scene/resources/shape.h"
#include "scene/resources/sphere_shape.h" #include "scene/resources/sphere_shape.h"
#include "modules/modules_enabled.gen.h"
#ifdef MODULE_CSG_ENABLED #ifdef MODULE_CSG_ENABLED
#include "modules/csg/csg_shape.h" #include "modules/csg/csg_shape.h"
#endif #endif
#ifdef MODULE_GRIDMAP_ENABLED #ifdef MODULE_GRIDMAP_ENABLED
#include "modules/gridmap/grid_map.h" #include "modules/gridmap/grid_map.h"
#endif #endif

View File

@ -14,10 +14,6 @@ thirdparty_sources = ["nanosvg.cc"]
thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
env_svg.Prepend(CPPPATH=[thirdparty_dir]) env_svg.Prepend(CPPPATH=[thirdparty_dir])
# FIXME: Needed in editor/editor_themes.cpp for now, but ideally there
# shouldn't be a dependency on modules/ and its own 3rd party deps.
env.Prepend(CPPPATH=[thirdparty_dir])
env.Append(CPPDEFINES=["SVG_ENABLED"])
env_thirdparty = env_svg.Clone() env_thirdparty = env_svg.Clone()
env_thirdparty.disable_warnings() env_thirdparty.disable_warnings()

View File

@ -30,9 +30,8 @@
#include "image_loader_svg.h" #include "image_loader_svg.h"
#include "core/os/os.h" #include <nanosvg.h>
#include "core/print_string.h" #include <nanosvgrast.h>
#include "core/ustring.h"
void SVGRasterizer::rasterize(NSVGimage *p_image, float p_tx, float p_ty, float p_scale, unsigned char *p_dst, int p_w, int p_h, int p_stride) { void SVGRasterizer::rasterize(NSVGimage *p_image, float p_tx, float p_ty, float p_scale, unsigned char *p_dst, int p_w, int p_h, int p_stride) {
nsvgRasterize(rasterizer, p_image, p_tx, p_ty, p_scale, p_dst, p_w, p_h, p_stride); nsvgRasterize(rasterizer, p_image, p_tx, p_ty, p_scale, p_dst, p_w, p_h, p_stride);

View File

@ -34,13 +34,14 @@
#include "core/io/image_loader.h" #include "core/io/image_loader.h"
#include "core/ustring.h" #include "core/ustring.h"
#include <nanosvg.h>
#include <nanosvgrast.h>
/** /**
@author Daniel Ramirez <djrmuv@gmail.com> @author Daniel Ramirez <djrmuv@gmail.com>
*/ */
// Forward declare and include thirdparty headers in .cpp.
struct NSVGrasterizer;
struct NSVGimage;
class SVGRasterizer { class SVGRasterizer {
NSVGrasterizer *rasterizer; NSVGrasterizer *rasterizer;

View File

@ -33,8 +33,13 @@
#include "core/math/math_defs.h" #include "core/math/math_defs.h"
#include "core/os/keyboard.h" #include "core/os/keyboard.h"
#include "core/os/os.h" #include "core/os/os.h"
#include "modules/regex/regex.h"
#include "scene/scene_string_names.h" #include "scene/scene_string_names.h"
#include "modules/modules_enabled.gen.h"
#ifdef MODULE_REGEX_ENABLED
#include "modules/regex/regex.h"
#endif
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
#include "editor/editor_scale.h" #include "editor/editor_scale.h"
#endif #endif
@ -2900,6 +2905,7 @@ Dictionary RichTextLabel::parse_expressions_for_values(Vector<String> p_expressi
Vector<String> values = parts[1].split(",", false); Vector<String> values = parts[1].split(",", false);
#ifdef MODULE_REGEX_ENABLED
RegEx color; RegEx color;
color.compile("^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$"); color.compile("^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$");
RegEx nodepath; RegEx nodepath;
@ -2933,6 +2939,7 @@ Dictionary RichTextLabel::parse_expressions_for_values(Vector<String> p_expressi
a.append(values[j]); a.append(values[j]);
} }
} }
#endif
if (values.size() > 1) { if (values.size() > 1) {
d[key] = a; d[key] = a;

View File

@ -28,8 +28,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#ifdef FREETYPE_ENABLED #include "modules/modules_enabled.gen.h"
#ifdef MODULE_FREETYPE_ENABLED
#include "dynamic_font.h" #include "dynamic_font.h"
#include "core/os/file_access.h" #include "core/os/file_access.h"
#include "core/os/os.h" #include "core/os/os.h"

View File

@ -31,7 +31,9 @@
#ifndef DYNAMIC_FONT_H #ifndef DYNAMIC_FONT_H
#define DYNAMIC_FONT_H #define DYNAMIC_FONT_H
#ifdef FREETYPE_ENABLED #include "modules/modules_enabled.gen.h"
#ifdef MODULE_FREETYPE_ENABLED
#include "core/io/resource_loader.h" #include "core/io/resource_loader.h"
#include "core/os/mutex.h" #include "core/os/mutex.h"
#include "core/os/thread_safe.h" #include "core/os/thread_safe.h"