diff options
| author | M.R.T <40250976+MRT-77@users.noreply.github.com> | 2020-10-02 05:48:36 +0330 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2020-10-05 02:20:12 -0400 |
| commit | af782db0e3b6025c7e3d2fa75421e0854b0bfb22 (patch) | |
| tree | 6f5e9dae958495c9f941c305b410b88641c33421 | |
| parent | b8e4d1cb0ab3a35c768d85d099cdd0603325726f (diff) | |
| download | curl-af782db0e3b6025c7e3d2fa75421e0854b0bfb22.tar.gz | |
build-wolfssl: fix build with Visual Studio 2019
Closes https://github.com/curl/curl/pull/6033
| -rw-r--r-- | projects/build-wolfssl.bat | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/projects/build-wolfssl.bat b/projects/build-wolfssl.bat index 9a7d67b79..ea077d1db 100644 --- a/projects/build-wolfssl.bat +++ b/projects/build-wolfssl.bat @@ -82,6 +82,20 @@ rem *************************************************************************** ) else ( set "VC_PATH=Microsoft Visual Studio\2017\Community\VC" ) + ) else if /i "%~1" == "vc14.2" ( + set VC_VER=14.2 + set VC_DESC=VC14.2 + set VC_TOOLSET=v142 + + rem Determine the VC14.2 path based on the installed edition in descending + rem order (Enterprise, then Professional and finally Community) + if exist "%PF%\Microsoft Visual Studio\2019\Enterprise\VC" ( + set "VC_PATH=Microsoft Visual Studio\2019\Enterprise\VC" + ) else if exist "%PF%\Microsoft Visual Studio\2019\Professional\VC" ( + set "VC_PATH=Microsoft Visual Studio\2019\Professional\VC" + ) else ( + set "VC_PATH=Microsoft Visual Studio\2019\Community\VC" + ) ) else if /i "%~1" == "x86" ( set BUILD_PLATFORM=x86 ) else if /i "%~1" == "x64" ( @@ -133,6 +147,7 @@ rem *************************************************************************** if "%VC_VER%" == "12.0" set VCVARS_PLATFORM=amd64 if "%VC_VER%" == "14.0" set VCVARS_PLATFORM=amd64 if "%VC_VER%" == "14.1" set VCVARS_PLATFORM=amd64 + if "%VC_VER%" == "14.2" set VCVARS_PLATFORM=amd64 ) :start @@ -141,6 +156,8 @@ rem *************************************************************************** if "%VC_VER%" == "14.1" ( call "%PF%\%VC_PATH%\Auxiliary\Build\vcvarsall" %VCVARS_PLATFORM% + ) else if "%VC_VER%" == "14.2" ( + call "%PF%\%VC_PATH%\Auxiliary\Build\vcvarsall" %VCVARS_PLATFORM% ) else ( call "%PF%\%VC_PATH%\vcvarsall" %VCVARS_PLATFORM% ) @@ -308,6 +325,7 @@ rem *************************************************************************** echo vc12 - Use Visual Studio 2013 echo vc14 - Use Visual Studio 2015 echo vc14.1 - Use Visual Studio 2017 + echo vc14.2 - Use Visual Studio 2019 echo. echo Platform: echo. |