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

Merge pull request #37467 from HaSa1002/fix-vsproj

Browse Source 
fixed modules not beeing added to vsproj
This commit is contained in:
Rémi Verschelde 2020-04-09 15:31:58 +02:00 committed by GitHub
commit 4f5ad0734b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/SCsub
View File

@ -11,6 +11,7 @@ Export("env_modules")
# Header with MODULE_*_ENABLED defines. # Header with MODULE_*_ENABLED defines.
env.CommandNoCache("modules_enabled.gen.h", Value(env.module_list), modules_builders.generate_modules_enabled) env.CommandNoCache("modules_enabled.gen.h", Value(env.module_list), modules_builders.generate_modules_enabled)
vs_sources = []
# libmodule_<name>.a for each active module. # libmodule_<name>.a for each active module.
for module in env.module_list: for module in env.module_list:
env.modules_sources = [] env.modules_sources = []
@ -23,6 +24,8 @@ for module in env.module_list:
lib = env_modules.add_library("module_%s" % module, env.modules_sources) lib = env_modules.add_library("module_%s" % module, env.modules_sources)
env.Prepend(LIBS=[lib]) env.Prepend(LIBS=[lib])
if env["vsproj"]:
vs_sources += env.modules_sources
# libmodules.a with only register_module_types. # libmodules.a with only register_module_types.
# Must be last so that all libmodule_<name>.a libraries are on the right side # 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") env_modules.add_source_files(env.modules_sources, "register_module_types.gen.cpp")
lib = env_modules.add_library("modules", env.modules_sources) lib = env_modules.add_library("modules", env.modules_sources)
env.Prepend(LIBS=[lib]) env.Prepend(LIBS=[lib])
if env["vsproj"]:
env.modules_sources += vs_sources