Skip to content

Commit

Permalink
Merge pull request godotengine#41453 from Xrayez/custom-modules-visua…
Browse files Browse the repository at this point in the history
…l-studio

Build the engine with custom modules in Visual Studio
  • Loading branch information
akien-mga authored Sep 3, 2020
2 parents a77106b + 6eb4b89 commit 493b308
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,7 @@ def build_commandline(commands):
'(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!',
]

Expand All @@ -555,15 +556,15 @@ def build_commandline(commands):
# 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
Expand Down

0 comments on commit 493b308

Please sign in to comment.