summaryrefslogtreecommitdiff
path: root/build.cmd
diff options
context:
space:
mode:
authorTanner Gooding <tagoo@outlook.com>2019-02-11 23:19:44 -0800
committerGitHub <noreply@github.com>2019-02-11 23:19:44 -0800
commitf0770609f8cdbeba019b35af48b70840f33bd479 (patch)
tree3415d53fe0cf130ca844520d614153e900c3b0bd /build.cmd
parent1c28b497ff2d49141f6a63e3f293095161e40d00 (diff)
downloadcoreclr-f0770609f8cdbeba019b35af48b70840f33bd479.tar.gz
coreclr-f0770609f8cdbeba019b35af48b70840f33bd479.tar.bz2
coreclr-f0770609f8cdbeba019b35af48b70840f33bd479.zip
Support building with VS2019 Preview (#22525)
* Support building with VS2019 Preview * Fixing gen-buildsys-win to only set the architecture for the VS generator * Refactoring Dev11/147911/fpcw.cpp so that it compiles under VS2019 * Removing the remaining traces of VS2015 build support
Diffstat (limited to 'build.cmd')
-rw-r--r--build.cmd12
1 files changed, 6 insertions, 6 deletions
diff --git a/build.cmd b/build.cmd
index dec253b5e3..b1e773139c 100644
--- a/build.cmd
+++ b/build.cmd
@@ -13,14 +13,14 @@ set __ThisScriptDir="%~dp0"
call "%__ThisScriptDir%"\setup_vs_tools.cmd
if NOT '%ERRORLEVEL%' == '0' exit /b 1
-if defined VS150COMNTOOLS (
+if defined VS160COMNTOOLS (
+ set "__VSToolsRoot=%VS160COMNTOOLS%"
+ set "__VCToolsRoot=%VS160COMNTOOLS%\..\..\VC\Auxiliary\Build"
+ set __VSVersion=vs2019
+) else if defined VS150COMNTOOLS (
set "__VSToolsRoot=%VS150COMNTOOLS%"
set "__VCToolsRoot=%VS150COMNTOOLS%\..\..\VC\Auxiliary\Build"
set __VSVersion=vs2017
-) else (
- set "__VSToolsRoot=%VS140COMNTOOLS%"
- set "__VCToolsRoot=%VS140COMNTOOLS%\..\..\VC"
- set __VSVersion=vs2015
)
:: Work around Jenkins CI + msbuild problem: Jenkins sometimes creates very large environment
@@ -1056,6 +1056,6 @@ at the install location of previous Visual Studio version. The workaround is to
of the previous version to "%VSINSTALLDIR%" and then build.
REM DIA SDK not included in Express editions
echo Visual Studio Express does not include the DIA SDK. ^
-You need Visual Studio 2015 or 2017 (Community is free).
+You need Visual Studio 2017 or 2019 (Community is free).
echo See: https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/developer-guide.md#prerequisites
exit /b 1