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.bat: Refer to VS2017 as VC14.1 instead of VC15

Browse Source 
.. and do the same for build-wolfssl.bat.

Because MS calls it VC14.1.

Closes https://github.com/curl/curl/pull/2189
This commit is contained in:
Jay Satiro 2017-12-22 17:00:32 -05:00 committed by Daniel Stenberg
parent 8585026524
commit 222de37f95
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
projects/build-openssl.bat
View File

@ -82,11 +82,11 @@ rem ***************************************************************************
set VC_VER=14.0 set VC_VER=14.0
set VC_DESC=VC14 set VC_DESC=VC14
set "VC_PATH=Microsoft Visual Studio 14.0\VC" set "VC_PATH=Microsoft Visual Studio 14.0\VC"
) else if /i "%~1" == "vc15" ( ) else if /i "%~1" == "vc14.1" (
set VC_VER=15.0 set VC_VER=14.1
set VC_DESC=VC15 set VC_DESC=VC14.1
rem Determine the VC15 path based on the installed edition in decending rem Determine the VC14.1 path based on the installed edition in descending
rem order (Enterprise, then Professional and finally Community) rem order (Enterprise, then Professional and finally Community)
if exist "%PF%\Microsoft Visual Studio\2017\Enterprise\VC" ( if exist "%PF%\Microsoft Visual Studio\2017\Enterprise\VC" (
set "VC_PATH=Microsoft Visual Studio\2017\Enterprise\VC" set "VC_PATH=Microsoft Visual Studio\2017\Enterprise\VC"
@ -208,7 +208,7 @@ 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 if "%VC_VER%" == "14.1" set VCVARS_PLATFORM=amd64
) )
:start :start
@ -221,15 +221,15 @@ rem ***************************************************************************
call "%ABS_VC_PATH%\bin\vcvars32" call "%ABS_VC_PATH%\bin\vcvars32"
) else if "%VC_VER%" == "7.1" ( ) else if "%VC_VER%" == "7.1" (
call "%ABS_VC_PATH%\bin\vcvars32" call "%ABS_VC_PATH%\bin\vcvars32"
) else if "%VC_VER%" == "15.0" ( ) 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 ( ) else (
call "%ABS_VC_PATH%\vcvarsall" %VCVARS_PLATFORM% call "%ABS_VC_PATH%\vcvarsall" %VCVARS_PLATFORM%
) )
echo. echo.
cd %SAVED_PATH% cd /d %SAVED_PATH%
cd %START_DIR% if defined START_DIR cd /d %START_DIR%
goto %BUILD_PLATFORM% goto %BUILD_PLATFORM%
:x64 :x64
@ -394,7 +394,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 vc14.1 - Use Visual Studio 2017
echo. echo.
echo Platform: echo Platform:
echo. echo.
@ -471,6 +471,6 @@ rem ***************************************************************************
exit /B 1 exit /B 1
:success :success
cd %SAVED_PATH% cd /d %SAVED_PATH%
endlocal endlocal
exit /B 0 exit /B 0

22
projects/build-wolfssl.bat
View File

@ -68,12 +68,12 @@ 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" ( ) else if /i "%~1" == "vc14.1" (
set VC_VER=15.0 set VC_VER=14.1
set VC_DESC=VC15 set VC_DESC=VC14.1
set VC_TOOLSET=v141 set VC_TOOLSET=v141
rem Determine the VC15 path based on the installed edition in decending rem Determine the VC14.1 path based on the installed edition in descending
rem order (Enterprise, then Professional and finally Community) rem order (Enterprise, then Professional and finally Community)
if exist "%PF%\Microsoft Visual Studio\2017\Enterprise\VC" ( if exist "%PF%\Microsoft Visual Studio\2017\Enterprise\VC" (
set "VC_PATH=Microsoft Visual Studio\2017\Enterprise\VC" set "VC_PATH=Microsoft Visual Studio\2017\Enterprise\VC"
@ -81,7 +81,7 @@ rem ***************************************************************************
set "VC_PATH=Microsoft Visual Studio\2017\Professional\VC" set "VC_PATH=Microsoft Visual Studio\2017\Professional\VC"
) else ( ) else (
set "VC_PATH=Microsoft Visual Studio\2017\Community\VC" 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" (
@ -132,22 +132,22 @@ 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 if "%VC_VER%" == "14.1" set VCVARS_PLATFORM=amd64
) )
:start :start
echo. echo.
set SAVED_PATH=%CD% set SAVED_PATH=%CD%
if "%VC_VER%" == "15.0" ( if "%VC_VER%" == "14.1" (
call "%PF%\%VC_PATH%\Auxiliary\Build\vcvarsall" %VCVARS_PLATFORM% call "%PF%\%VC_PATH%\Auxiliary\Build\vcvarsall" %VCVARS_PLATFORM%
) else ( ) else (
call "%PF%\%VC_PATH%\vcvarsall" %VCVARS_PLATFORM% call "%PF%\%VC_PATH%\vcvarsall" %VCVARS_PLATFORM%
) )
echo. echo.
cd %SAVED_PATH% cd /d %SAVED_PATH%
cd %START_DIR% if defined START_DIR cd /d %START_DIR%
goto %BUILD_PLATFORM% goto %BUILD_PLATFORM%
:x64 :x64
@ -307,7 +307,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 vc14.1 - Use Visual Studio 2017
echo. echo.
echo Platform: echo Platform:
echo. echo.
@ -369,6 +369,6 @@ rem ***************************************************************************
echo %SUCCESSFUL_BUILDS% echo %SUCCESSFUL_BUILDS%
echo. echo.
) )
cd %SAVED_PATH% cd /d %SAVED_PATH%
endlocal endlocal
exit /B 0 exit /B 0