Skip to content

Commit 3ac9843

Browse files
authored
Merge pull request godotengine#92661 from Repiteo/scons/fix-mono-dependency
SCons: Fix `mono` dependency
2 parents 705b7a0 + 05203b6 commit 3ac9843

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

core/SCsub

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ def version_info_builder(target, source, env):
194194
)
195195

196196

197-
env.CommandNoCache("version_generated.gen.h", "#version.py", env.Run(version_info_builder))
197+
env.CommandNoCache("version_generated.gen.h", env.Value(env.version_info), env.Run(version_info_builder))
198198

199199

200200
# Generate version hash

modules/SCsub

+15-11
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,18 @@ env_modules.Append(CPPDEFINES=["GODOT_MODULE"])
1414
Export("env_modules")
1515

1616

17+
# Header with MODULE_*_ENABLED defines.
18+
def modules_enabled_builder(target, source, env):
19+
with methods.generated_wrapper(target) as file:
20+
for module in source[0].read():
21+
file.write(f"#define MODULE_{module.upper()}_ENABLED\n")
22+
23+
24+
modules_enabled = env.CommandNoCache(
25+
"modules_enabled.gen.h", env.Value(env.module_list), env.Run(modules_enabled_builder)
26+
)
27+
28+
1729
def register_module_types_builder(target, source, env):
1830
modules = source[0].read()
1931
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) {{
4456

4557

4658
register_module_types = env.CommandNoCache(
47-
"register_module_types.gen.cpp", env.Value(env.modules_detected), env.Run(register_module_types_builder)
59+
"register_module_types.gen.cpp",
60+
[env.Value(env.modules_detected), modules_enabled],
61+
env.Run(register_module_types_builder),
4862
)
4963

5064

51-
# Header with MODULE_*_ENABLED defines.
52-
def modules_enabled_builder(target, source, env):
53-
with methods.generated_wrapper(target) as file:
54-
for module in source[0].read():
55-
file.write(f"#define MODULE_{module.upper()}_ENABLED\n")
56-
57-
58-
env.CommandNoCache("modules_enabled.gen.h", env.Value(env.module_list), env.Run(modules_enabled_builder))
59-
60-
6165
vs_sources = []
6266
test_headers = []
6367
# libmodule_<name>.a for each active module.

0 commit comments

Comments
 (0)