moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 09:21:50 -05:00
Code Issues Releases Wiki Activity

build-openssl: fix build with Visual Studio 2019

Browse Source 
Reviewed-by: Marcel Raad
Contributed-by: osabc on github
Fixes #4188
Closes #4266
This commit is contained in:
Daniel Stenberg 2019-08-26 12:06:47 +02:00
parent 7e513c1048
commit c661d731be
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
projects/build-openssl.bat
View File

@ -95,6 +95,19 @@ rem ***************************************************************************
) else ( ) else (
set "VC_PATH=Microsoft Visual Studio\2017\Community\VC" 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
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" ( ) else if /i "%~1%" == "x86" (
set BUILD_PLATFORM=x86 set BUILD_PLATFORM=x86
) else if /i "%~1%" == "x64" ( ) else if /i "%~1%" == "x64" (
@ -202,6 +215,7 @@ rem ***************************************************************************
if "%VC_VER%" == "12.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%" == "14.0" set VCVARS_PLATFORM=amd64
if "%VC_VER%" == "14.1" set VCVARS_PLATFORM=amd64 if "%VC_VER%" == "14.1" set VCVARS_PLATFORM=amd64
if "%VC_VER%" == "14.2" set VCVARS_PLATFORM=amd64
) )
if exist "%START_DIR%\ms\do_ms.bat" ( if exist "%START_DIR%\ms\do_ms.bat" (
@ -222,6 +236,8 @@ rem ***************************************************************************
call "%ABS_VC_PATH%\bin\vcvars32" call "%ABS_VC_PATH%\bin\vcvars32"
) else if "%VC_VER%" == "14.1" ( ) else if "%VC_VER%" == "14.1" (
call "%ABS_VC_PATH%\Auxiliary\Build\vcvarsall" %VCVARS_PLATFORM% call "%ABS_VC_PATH%\Auxiliary\Build\vcvarsall" %VCVARS_PLATFORM%
) else if "%VC_VER%" == "14.2" (
call "%ABS_VC_PATH%\Auxiliary\Build\vcvarsall" %VCVARS_PLATFORM%
) else ( ) else (
call "%ABS_VC_PATH%\vcvarsall" %VCVARS_PLATFORM% call "%ABS_VC_PATH%\vcvarsall" %VCVARS_PLATFORM%
) )
@ -605,6 +621,7 @@ rem
echo vc12 - Use Visual Studio 2013 echo vc12 - Use Visual Studio 2013
echo vc14 - Use Visual Studio 2015 echo vc14 - Use Visual Studio 2015
echo vc14.1 - Use Visual Studio 2017 echo vc14.1 - Use Visual Studio 2017
echo vc14.2 - Use Visual Studio 2019
echo. echo.
echo Platform: echo Platform:
echo. echo.