diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-06-05 19:38:48 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-06-05 19:38:48 +0300 |
| commit | 5e44324b7985faaa849513d17c3d8076c92718ab (patch) | |
| tree | ce4ef0fe8791457006687fa21c45adf2b7bc3e6f /build_files/windows | |
| parent | 1628a6858e22d5e49798f84576283debc5cf2819 (diff) | |
make.bat: change the way the vs buildtools are detected.
The recent change also used the buildtools instead of the regular compiler, you now have to explicitly state what you want to use :
2017 - the standard msvc compiler
2017pre - the msvc compiler from the preview installation
2017b - the msvc compiler from the buildtools installation
Diffstat (limited to 'build_files/windows')
| -rw-r--r-- | build_files/windows/detect_msvc2017.cmd | 7 | ||||
| -rw-r--r-- | build_files/windows/parse_arguments.cmd | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/build_files/windows/detect_msvc2017.cmd b/build_files/windows/detect_msvc2017.cmd index 90fad8744b5..060e9f88617 100644 --- a/build_files/windows/detect_msvc2017.cmd +++ b/build_files/windows/detect_msvc2017.cmd @@ -12,7 +12,12 @@ if not exist "%vs_where%" ( goto FAIL ) ) -for /f "usebackq tokens=1* delims=: " %%i in (`"%vs_where%" -products * -latest %VSWHERE_ARGS% -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64`) do ( + +if NOT "%verbose%" == "" ( + echo "%vs_where%" -latest %VSWHERE_ARGS% -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64` + ) + +for /f "usebackq tokens=1* delims=: " %%i in (`"%vs_where%" -latest %VSWHERE_ARGS% -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64`) do ( if /i "%%i"=="installationPath" set VS_InstallDir=%%j ) diff --git a/build_files/windows/parse_arguments.cmd b/build_files/windows/parse_arguments.cmd index 2cc0acfd243..8a6d743978d 100644 --- a/build_files/windows/parse_arguments.cmd +++ b/build_files/windows/parse_arguments.cmd @@ -53,6 +53,10 @@ if NOT "%1" == "" ( ) else if "%1" == "2017pre" ( set BUILD_VS_YEAR=2017 set VSWHERE_ARGS=-prerelease + set BUILD_VS_YEAR=2017 + ) else if "%1" == "2017b" ( + set BUILD_VS_YEAR=2017 + set VSWHERE_ARGS=-products Microsoft.VisualStudio.Product.BuildTools ) else if "%1" == "2015" ( set BUILD_VS_YEAR=2015 ) else if "%1" == "2013" ( |