moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-01-11 05:58:01 -05:00
Code Issues Releases Wiki Activity

build-wolfssl: fix build with Visual Studio 2019

Browse Source 
Closes https://github.com/curl/curl/pull/6033
This commit is contained in:
M.R.T 2020-10-02 05:48:36 +03:30 committed by Jay Satiro
parent b8e4d1cb0a
commit af782db0e3
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
projects/build-wolfssl.bat
View File

@ -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.