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

Merge pull request #27271 from shartte/fix-msbuild-detection

Browse Source 
Add support for new MSBuild directory naming introduced in VS 2019
This commit is contained in:
Ignacio Roldán Etcheverry 2019-03-20 18:30:31 +01:00 committed by GitHub
commit b0fbefe9da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/mono/utils/mono_reg_utils.cpp
View File

@ -29,6 +29,7 @@
/*************************************************************************/ /*************************************************************************/
#include "mono_reg_utils.h" #include "mono_reg_utils.h"
#include "core/os/dir_access.h"
#ifdef WINDOWS_ENABLED #ifdef WINDOWS_ENABLED
@ -200,6 +201,13 @@ String find_msbuild_tools_path() {
val += "\\"; val += "\\";
} }
// Since VS2019, the directory is simply named "Current"
String msBuildDirectory = val + "MSBuild\\Current\\Bin";
if (DirAccess::exists(msBuildDirectory)) {
return msBuildDirectory;
}
// Directory name "15.0" is used in VS 2017
return val + "MSBuild\\15.0\\Bin"; return val + "MSBuild\\15.0\\Bin";
} }
} }