diff options
| author | Jay Satiro <raysatiro@yahoo.com> | 2017-12-22 17:00:32 -0500 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-04-06 15:16:35 +0200 |
| commit | 222de37f95bffca8d5378b020ea9db0e49ee4309 (patch) | |
| tree | df49519a551a5bd9d25a497fc7dbf0dc478ab9e0 /projects/build-openssl.bat | |
| parent | 858502652408d060c80e9626d7cf89183ebe6a94 (diff) | |
| download | curl-222de37f95bffca8d5378b020ea9db0e49ee4309.tar.gz | |
build-openssl.bat: Refer to VS2017 as VC14.1 instead of VC15
.. and do the same for build-wolfssl.bat.
Because MS calls it VC14.1.
Closes https://github.com/curl/curl/pull/2189
Diffstat (limited to 'projects/build-openssl.bat')
| -rw-r--r-- | projects/build-openssl.bat | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat index f5ff12d5e..d337b219c 100644 --- a/projects/build-openssl.bat +++ b/projects/build-openssl.bat @@ -82,11 +82,11 @@ rem *************************************************************************** set VC_VER=14.0 set VC_DESC=VC14 set "VC_PATH=Microsoft Visual Studio 14.0\VC" - ) else if /i "%~1" == "vc15" ( - set VC_VER=15.0 - set VC_DESC=VC15 + ) else if /i "%~1" == "vc14.1" ( + set VC_VER=14.1 + set VC_DESC=VC14.1 - rem Determine the VC15 path based on the installed edition in decending + rem Determine the VC14.1 path based on the installed edition in descending rem order (Enterprise, then Professional and finally Community) if exist "%PF%\Microsoft Visual Studio\2017\Enterprise\VC" ( set "VC_PATH=Microsoft Visual Studio\2017\Enterprise\VC" @@ -208,7 +208,7 @@ rem *************************************************************************** if "%VC_VER%" == "11.0" set VCVARS_PLATFORM=amd64 if "%VC_VER%" == "12.0" set VCVARS_PLATFORM=amd64 if "%VC_VER%" == "14.0" set VCVARS_PLATFORM=amd64 - if "%VC_VER%" == "15.0" set VCVARS_PLATFORM=amd64 + if "%VC_VER%" == "14.1" set VCVARS_PLATFORM=amd64 ) :start @@ -221,15 +221,15 @@ rem *************************************************************************** call "%ABS_VC_PATH%\bin\vcvars32" ) else if "%VC_VER%" == "7.1" ( call "%ABS_VC_PATH%\bin\vcvars32" - ) else if "%VC_VER%" == "15.0" ( + ) else if "%VC_VER%" == "14.1" ( call "%ABS_VC_PATH%\Auxiliary\Build\vcvarsall" %VCVARS_PLATFORM% ) else ( call "%ABS_VC_PATH%\vcvarsall" %VCVARS_PLATFORM% ) echo. - cd %SAVED_PATH% - cd %START_DIR% + cd /d %SAVED_PATH% + if defined START_DIR cd /d %START_DIR% goto %BUILD_PLATFORM% :x64 @@ -394,7 +394,7 @@ rem *************************************************************************** echo vc11 - Use Visual Studio 2012 echo vc12 - Use Visual Studio 2013 echo vc14 - Use Visual Studio 2015 - echo vc15 - Use Visual Studio 2017 + echo vc14.1 - Use Visual Studio 2017 echo. echo Platform: echo. @@ -471,6 +471,6 @@ rem *************************************************************************** exit /B 1 :success - cd %SAVED_PATH% + cd /d %SAVED_PATH% endlocal exit /B 0 |