diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-09-03 11:57:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-03 11:57:15 +0200 |
| commit | 493b30821529baf2c235eb387f2b7964774c0cc7 (patch) | |
| tree | a43961eda20dab75f3f0698285861d7740af7b3e | |
| parent | a77106bf7e9a5fdf6b004bff9fc883b66804bc80 (diff) | |
| parent | 6eb4b89eef215ec5b513cadced24b8d835f84d30 (diff) | |
Merge pull request #41453 from Xrayez/custom-modules-visual-studio
Build the engine with custom modules in Visual Studio
| -rw-r--r-- | methods.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/methods.py b/methods.py index bcb6d13e1f..8f14de6dac 100644 --- a/methods.py +++ b/methods.py @@ -536,6 +536,7 @@ def generate_vs_project(env, num_jobs): '(if "$(PlatformTarget)"=="x64" (set "plat=x86_amd64"))', 'set "tools=yes"', '(if "$(Configuration)"=="release" (set "tools=no"))', + 'set "custom_modules=%s"' % env["custom_modules"], 'call "' + batch_file + '" !plat!', ] @@ -555,15 +556,15 @@ def generate_vs_project(env, num_jobs): # last double quote off, confusing MSBuild env["MSVSBUILDCOM"] = build_commandline( "scons --directory=\"$(ProjectDir.TrimEnd('\\'))\" platform=windows progress=no target=$(Configuration)" - " tools=!tools! -j" + str(num_jobs) + " tools=!tools! custom_modules=!custom_modules! -j" + str(num_jobs) ) env["MSVSREBUILDCOM"] = build_commandline( "scons --directory=\"$(ProjectDir.TrimEnd('\\'))\" platform=windows progress=no target=$(Configuration)" - " tools=!tools! vsproj=yes -j" + str(num_jobs) + " tools=!tools! custom_modules=!custom_modules! vsproj=yes -j" + str(num_jobs) ) env["MSVSCLEANCOM"] = build_commandline( "scons --directory=\"$(ProjectDir.TrimEnd('\\'))\" --clean platform=windows progress=no" - " target=$(Configuration) tools=!tools! -j" + str(num_jobs) + " target=$(Configuration) tools=!tools! custom_modules=!custom_modules! -j" + str(num_jobs) ) # This version information (Win32, x64, Debug, Release, Release_Debug seems to be |