summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-04-09 15:31:58 +0200
committerGitHub <noreply@github.com>2020-04-09 15:31:58 +0200
commit4f5ad0734b588f223aa78193b60620d7490e633b (patch)
treec9d4a081a931f353a7d08337b7b39ad49ada76a3
parentc5f71ecc6a60e5a92a1f711a1368e051d4824b25 (diff)
parent0b615bb997e9d55b95b1e5faf8e497383761e995 (diff)
Merge pull request #37467 from HaSa1002/fix-vsproj
fixed modules not beeing added to vsproj
-rw-r--r--modules/SCsub5
1 files changed, 5 insertions, 0 deletions
diff --git a/modules/SCsub b/modules/SCsub
index 1671b398e5..fb46c5f877 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_<name>.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_<name>.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