godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #92661 from Repiteo/scons/fix-mono-dependency 

SCons: Fix `mono` dependency
This commit is contained in:
Rémi Verschelde 2024-06-03 02:15:39 +02:00 committed by GitHub
parent 705b7a0b0b 05203b6a43
commit 3ac98435ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/SCsub
View File

@ -194,7 +194,7 @@ def version_info_builder(target, source, env):
) )
env.CommandNoCache("version_generated.gen.h", "#version.py", env.Run(version_info_builder)) env.CommandNoCache("version_generated.gen.h", env.Value(env.version_info), env.Run(version_info_builder))
# Generate version hash # Generate version hash

26
modules/SCsub
View File

@ -14,6 +14,18 @@ env_modules.Append(CPPDEFINES=["GODOT_MODULE"])
Export("env_modules") Export("env_modules")
# Header with MODULE_*_ENABLED defines.
def modules_enabled_builder(target, source, env):
with methods.generated_wrapper(target) as file:
for module in source[0].read():
file.write(f"#define MODULE_{module.upper()}_ENABLED\n")
modules_enabled = env.CommandNoCache(
"modules_enabled.gen.h", env.Value(env.module_list), env.Run(modules_enabled_builder)
)
def register_module_types_builder(target, source, env): def register_module_types_builder(target, source, env):
modules = source[0].read() modules = source[0].read()
mod_inc = "\n".join([f'#include "{p}/register_types.h"' for p in modules.values()]) mod_inc = "\n".join([f'#include "{p}/register_types.h"' for p in modules.values()])
@ -44,20 +56,12 @@ void uninitialize_modules(ModuleInitializationLevel p_level) {{
register_module_types = env.CommandNoCache( register_module_types = env.CommandNoCache(
"register_module_types.gen.cpp", env.Value(env.modules_detected), env.Run(register_module_types_builder) "register_module_types.gen.cpp",
[env.Value(env.modules_detected), modules_enabled],
env.Run(register_module_types_builder),
) )
# Header with MODULE_*_ENABLED defines.
def modules_enabled_builder(target, source, env):
with methods.generated_wrapper(target) as file:
for module in source[0].read():
file.write(f"#define MODULE_{module.upper()}_ENABLED\n")
env.CommandNoCache("modules_enabled.gen.h", env.Value(env.module_list), env.Run(modules_enabled_builder))
vs_sources = [] vs_sources = []
test_headers = [] test_headers = []
# libmodule_<name>.a for each active module. # libmodule_<name>.a for each active module.