Skip to content

Commit

Permalink
Merge pull request #92661 from Repiteo/scons/fix-mono-dependency
Browse files Browse the repository at this point in the history
SCons: Fix `mono` dependency
  • Loading branch information
akien-mga authored Jun 3, 2024
2 parents 705b7a0 + 05203b6 commit 3ac9843
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion core/SCsub
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 15 additions & 11 deletions modules/SCsub
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,18 @@ env_modules.Append(CPPDEFINES=["GODOT_MODULE"])
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):
modules = source[0].read()
mod_inc = "\n".join([f'#include "{p}/register_types.h"' for p in modules.values()])
Expand Down Expand Up @@ -44,20 +56,12 @@ void uninitialize_modules(ModuleInitializationLevel p_level) {{


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 = []
test_headers = []
# libmodule_<name>.a for each active module.
Expand Down

0 comments on commit 3ac9843

Please sign in to comment.