aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2019-08-26 12:06:47 +0200
committerDaniel Stenberg <daniel@haxx.se>2019-08-26 14:34:26 +0200
commitc661d731becc17b038ca707af27a82863a3e516d (patch)
tree2f57d6b272cbce131b53caade9fe51b684219cb8
parent7e513c1048fc506885ded033a37151309cc71af7 (diff)
build-openssl: fix build with Visual Studio 2019
Reviewed-by: Marcel Raad Contributed-by: osabc on github Fixes #4188 Closes #4266
-rw-r--r--projects/build-openssl.bat19
1 files changed, 18 insertions, 1 deletions
diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat
index 793a63be7..c9633b448 100644
--- a/projects/build-openssl.bat
+++ b/projects/build-openssl.bat
@@ -95,6 +95,19 @@ 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
+
+ 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" (
@@ -202,6 +215,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
)
if exist "%START_DIR%\ms\do_ms.bat" (
@@ -222,6 +236,8 @@ rem ***************************************************************************
call "%ABS_VC_PATH%\bin\vcvars32"
) else if "%VC_VER%" == "14.1" (
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 (
call "%ABS_VC_PATH%\vcvarsall" %VCVARS_PLATFORM%
)
@@ -569,7 +585,7 @@ rem
if not exist "%OUTDIR%\DLL Release" (
mkdir "%OUTDIR%\DLL Release" 1>nul
)
-
+
move !build_dir!\lib\*.lib "%OUTDIR%\DLL Release" 1>nul
move !build_dir!\bin\*.dll "%OUTDIR%\DLL Release" 1>nul
move !build_dir!\bin\*.exe "%OUTDIR%\DLL Release" 1>nul
@@ -605,6 +621,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.