mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 23:58:49 -05:00
build-wolfssl.bat: Added support for VC15
This commit is contained in:
parent
a4e88317dd
commit
d409640d66
@ -6,7 +6,7 @@ rem * / __| | | | |_) | |
|
|||||||
rem * | (__| |_| | _ <| |___
|
rem * | (__| |_| | _ <| |___
|
||||||
rem * \___|\___/|_| \_\_____|
|
rem * \___|\___/|_| \_\_____|
|
||||||
rem *
|
rem *
|
||||||
rem * Copyright (C) 2012 - 2015, Steve Holme, <steve_holme@hotmail.com>.
|
rem * Copyright (C) 2012 - 2017, Steve Holme, <steve_holme@hotmail.com>.
|
||||||
rem * Copyright (C) 2015, Jay Satiro, <raysatiro@yahoo.com>.
|
rem * Copyright (C) 2015, Jay Satiro, <raysatiro@yahoo.com>.
|
||||||
rem *
|
rem *
|
||||||
rem * This software is licensed as described in the file COPYING, which
|
rem * This software is licensed as described in the file COPYING, which
|
||||||
@ -58,6 +58,11 @@ rem ***************************************************************************
|
|||||||
set VC_DESC=VC14
|
set VC_DESC=VC14
|
||||||
set VC_TOOLSET=v140
|
set VC_TOOLSET=v140
|
||||||
set "VC_PATH=Microsoft Visual Studio 14.0\VC"
|
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_TOOLSET=v141
|
||||||
|
set "VC_PATH=Microsoft Visual Studio\2017\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" (
|
||||||
@ -119,14 +124,21 @@ rem ***************************************************************************
|
|||||||
if "%VC_VER%" == "11.0" set VCVARS_PLATFORM=amd64
|
if "%VC_VER%" == "11.0" set VCVARS_PLATFORM=amd64
|
||||||
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%" == "15.0" set VCVARS_PLATFORM=amd64
|
||||||
)
|
)
|
||||||
|
|
||||||
:start
|
:start
|
||||||
echo.
|
echo.
|
||||||
call "%PF%\%VC_PATH%\vcvarsall" %VCVARS_PLATFORM%
|
set SAVED_PATH=%CD%
|
||||||
|
|
||||||
|
if "%VC_VER%" == "15.0" (
|
||||||
|
call "%PF%\%VC_PATH%\Auxiliary\Build\vcvarsall" %VCVARS_PLATFORM%
|
||||||
|
) else (
|
||||||
|
call "%PF%\%VC_PATH%\vcvarsall" %VCVARS_PLATFORM%
|
||||||
|
)
|
||||||
|
|
||||||
echo.
|
echo.
|
||||||
set SAVED_PATH=%CD%
|
cd %SAVED_PATH%
|
||||||
cd %START_DIR%
|
cd %START_DIR%
|
||||||
goto %BUILD_PLATFORM%
|
goto %BUILD_PLATFORM%
|
||||||
|
|
||||||
@ -287,6 +299,7 @@ rem ***************************************************************************
|
|||||||
echo vc11 - Use Visual Studio 2012
|
echo vc11 - Use Visual Studio 2012
|
||||||
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 vc15 - Use Visual Studio 2017
|
||||||
echo.
|
echo.
|
||||||
echo Platform:
|
echo Platform:
|
||||||
echo.
|
echo.
|
||||||
|
Loading…
Reference in New Issue
Block a user