diff --git a/modules/SCsub b/modules/SCsub index f4a7fe0b9cf..69dfadfa311 100644 --- a/modules/SCsub +++ b/modules/SCsub @@ -37,8 +37,9 @@ for name, path in env.module_list.items(): base_path = path if os.path.isabs(path) else name SConscript(base_path + "/SCsub") - lib = env_modules.add_library("module_%s" % name, env.modules_sources) - env.Prepend(LIBS=[lib]) + if env.modules_sources: + lib = env_modules.add_library("module_%s" % name, env.modules_sources) + env.Prepend(LIBS=[lib]) if env["tests"]: # Lookup potential headers in `tests` subfolder. diff --git a/modules/freetype/register_types.cpp b/modules/freetype/register_types.cpp deleted file mode 100644 index 70f277c3a4d..00000000000 --- a/modules/freetype/register_types.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************/ -/* register_types.cpp */ -/**************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#include "register_types.h" - -void initialize_freetype_module(ModuleInitializationLevel p_level) { - if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) { - return; - } -} - -void uninitialize_freetype_module(ModuleInitializationLevel p_level) { - if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) { - return; - } -} diff --git a/modules/freetype/register_types.h b/modules/freetype/register_types.h index f2cd8b87da8..97ed76752e5 100644 --- a/modules/freetype/register_types.h +++ b/modules/freetype/register_types.h @@ -32,5 +32,5 @@ #include "modules/register_module_types.h" -void initialize_freetype_module(ModuleInitializationLevel p_level); -void uninitialize_freetype_module(ModuleInitializationLevel p_level); +void initialize_freetype_module(ModuleInitializationLevel p_level) {} +void uninitialize_freetype_module(ModuleInitializationLevel p_level) {} diff --git a/modules/msdfgen/register_types.cpp b/modules/msdfgen/register_types.cpp deleted file mode 100644 index f9188020180..00000000000 --- a/modules/msdfgen/register_types.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************/ -/* register_types.cpp */ -/**************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#include "register_types.h" - -void initialize_msdfgen_module(ModuleInitializationLevel p_level) { - if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) { - return; - } -} - -void uninitialize_msdfgen_module(ModuleInitializationLevel p_level) { - if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) { - return; - } -} diff --git a/modules/msdfgen/register_types.h b/modules/msdfgen/register_types.h index 993c3c393df..ee13755dd13 100644 --- a/modules/msdfgen/register_types.h +++ b/modules/msdfgen/register_types.h @@ -32,5 +32,5 @@ #include "modules/register_module_types.h" -void initialize_msdfgen_module(ModuleInitializationLevel p_level); -void uninitialize_msdfgen_module(ModuleInitializationLevel p_level); +void initialize_msdfgen_module(ModuleInitializationLevel p_level) {} +void uninitialize_msdfgen_module(ModuleInitializationLevel p_level) {}