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

Merge pull request #41453 from Xrayez/custom-modules-visual-studio 

Build the engine with custom modules in Visual Studio
This commit is contained in:
Rémi Verschelde 2020-09-03 11:57:15 +02:00 committed by GitHub
parent a77106bf7e 6eb4b89eef
commit 493b308215
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
methods.py
View File

@ -536,6 +536,7 @@ def generate_vs_project(env, num_jobs):
'(if "$(PlatformTarget)"=="x64" (set "plat=x86_amd64"))', '(if "$(PlatformTarget)"=="x64" (set "plat=x86_amd64"))',
'set "tools=yes"', 'set "tools=yes"',
'(if "$(Configuration)"=="release" (set "tools=no"))', '(if "$(Configuration)"=="release" (set "tools=no"))',
'set "custom_modules=%s"' % env["custom_modules"],
'call "' + batch_file + '" !plat!', 'call "' + batch_file + '" !plat!',
] ]
@ -555,15 +556,15 @@ def generate_vs_project(env, num_jobs):
# last double quote off, confusing MSBuild # last double quote off, confusing MSBuild
env["MSVSBUILDCOM"] = build_commandline( env["MSVSBUILDCOM"] = build_commandline(
"scons --directory=\"$(ProjectDir.TrimEnd('\\'))\" platform=windows progress=no target=$(Configuration)" "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( env["MSVSREBUILDCOM"] = build_commandline(
"scons --directory=\"$(ProjectDir.TrimEnd('\\'))\" platform=windows progress=no target=$(Configuration)" "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( env["MSVSCLEANCOM"] = build_commandline(
"scons --directory=\"$(ProjectDir.TrimEnd('\\'))\" --clean platform=windows progress=no" "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 # This version information (Win32, x64, Debug, Release, Release_Debug seems to be