From 0b615bb997e9d55b95b1e5faf8e497383761e995 Mon Sep 17 00:00:00 2001 From: HaSa1002 Date: Tue, 31 Mar 2020 16:39:39 +0200 Subject: [PATCH] fixed modules not beeing added to vsproj --- modules/SCsub | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/SCsub b/modules/SCsub index 1671b398e57..fb46c5f8771 100644 --- a/modules/SCsub +++ b/modules/SCsub @@ -11,6 +11,7 @@ Export("env_modules") # Header with MODULE_*_ENABLED defines. env.CommandNoCache("modules_enabled.gen.h", Value(env.module_list), modules_builders.generate_modules_enabled) +vs_sources = [] # libmodule_.a for each active module. for module in env.module_list: env.modules_sources = [] @@ -23,6 +24,8 @@ for module in env.module_list: lib = env_modules.add_library("module_%s" % module, env.modules_sources) env.Prepend(LIBS=[lib]) + if env["vsproj"]: + vs_sources += env.modules_sources # libmodules.a with only register_module_types. # Must be last so that all libmodule_.a libraries are on the right side @@ -31,3 +34,5 @@ env.modules_sources = [] env_modules.add_source_files(env.modules_sources, "register_module_types.gen.cpp") lib = env_modules.add_library("modules", env.modules_sources) env.Prepend(LIBS=[lib]) +if env["vsproj"]: + env.modules_sources += vs_sources