aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2017-12-22 15:44:19 +0000
committerSteve Holme <steve_holme@hotmail.com>2017-12-22 15:44:19 +0000
commita4e88317dd9a92217839ae3a72563d04a754a869 (patch)
treee6f3bd1e73747bd5a5b695ecebece3e0bd92e258
parentc97648b55080343bb371522bf4233e94a2a13a99 (diff)
build-openssl.bat: Added support for VC15
-rw-r--r--projects/build-openssl.bat16
1 files changed, 13 insertions, 3 deletions
diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat
index 33da17401..2a135b910 100644
--- a/projects/build-openssl.bat
+++ b/projects/build-openssl.bat
@@ -6,7 +6,7 @@ rem * / __| | | | |_) | |
rem * | (__| |_| | _ <| |___
rem * \___|\___/|_| \_\_____|
rem *
-rem * Copyright (C) 2012 - 2016, Steve Holme, <steve_holme@hotmail.com>.
+rem * Copyright (C) 2012 - 2017, Steve Holme, <steve_holme@hotmail.com>.
rem *
rem * This software is licensed as described in the file COPYING, which
rem * you should have received as part of this distribution. The terms
@@ -72,6 +72,10 @@ 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
+ set "VC_PATH=Microsoft Visual Studio\2017\Community\VC"
) else if /i "%~1%" == "x86" (
set BUILD_PLATFORM=x86
) else if /i "%~1%" == "x64" (
@@ -166,23 +170,28 @@ 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
)
:start
echo.
+ set SAVED_PATH=%CD%
+
if "%VC_VER%" == "6.0" (
call "%PF%\%VC_PATH%\bin\vcvars32"
) else if "%VC_VER%" == "7.0" (
call "%PF%\%VC_PATH%\bin\vcvars32"
) else if "%VC_VER%" == "7.1" (
call "%PF%\%VC_PATH%\bin\vcvars32"
+ ) else if "%VC_VER%" == "15.0" (
+ call "%PF%\%VC_PATH%\Auxiliary\Build\vcvarsall" %VCVARS_PLATFORM%
) else (
call "%PF%\%VC_PATH%\vcvarsall" %VCVARS_PLATFORM%
)
echo.
- set SAVED_PATH=%CD%
- if defined START_DIR CD %START_DIR%
+ cd %SAVED_PATH%
+ cd %START_DIR%
goto %BUILD_PLATFORM%
:x64
@@ -307,6 +316,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.
echo Platform:
echo.