diff options
| author | Elliott Hughes <enh@google.com> | 2018-03-01 00:49:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-01 00:49:05 +0000 |
| commit | bc62129759e24edcb1868174cc5128cd0295643d (patch) | |
| tree | ba15caf6905acc99ac3fbab158d7bf2fb0364a21 /projects/build-openssl.bat | |
| parent | 88470c369727a48d5509071d76108fc1953ce7d1 (diff) | |
| parent | 279fa5e2839348e5b1898acbd247d4e70857f8e1 (diff) | |
| download | android_external_curl-bc62129759e24edcb1868174cc5128cd0295643d.tar.gz android_external_curl-bc62129759e24edcb1868174cc5128cd0295643d.tar.bz2 android_external_curl-bc62129759e24edcb1868174cc5128cd0295643d.zip | |
Merge "Update to 7.58.0 - January 24 2018." am: 0c6d81f80b am: 95f668fdba
am: 279fa5e283
Change-Id: Ia93ddb50ee0c699a1e283b7094d895ff7bc2d6be
Diffstat (limited to 'projects/build-openssl.bat')
| -rw-r--r-- | projects/build-openssl.bat | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat index 33da174..2a135b9 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. |