mirror of
https://github.com/curl/curl.git
synced 2025-09-17 09:32:48 +03:00
projects: fix third-party SSL library build paths for Visual Studio
The paths used by the build batch files were inconsistent with those in the Visual Studio project files. Closes #8991
This commit is contained in:
parent
4bf2c231d7
commit
aea8ac14df
|
@ -75,7 +75,7 @@ rem ***************************************************************************
|
||||||
set "VC_PATH=Microsoft Visual Studio 14.0\VC"
|
set "VC_PATH=Microsoft Visual Studio 14.0\VC"
|
||||||
) else if /i "%~1" == "vc14.1" (
|
) else if /i "%~1" == "vc14.1" (
|
||||||
set VC_VER=14.1
|
set VC_VER=14.1
|
||||||
set VC_DESC=VC14.1
|
set VC_DESC=VC14.10
|
||||||
|
|
||||||
rem Determine the VC14.1 path based on the installed edition in descending
|
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)
|
||||||
|
@ -88,7 +88,7 @@ rem ***************************************************************************
|
||||||
)
|
)
|
||||||
) else if /i "%~1" == "vc14.2" (
|
) else if /i "%~1" == "vc14.2" (
|
||||||
set VC_VER=14.2
|
set VC_VER=14.2
|
||||||
set VC_DESC=VC14.2
|
set VC_DESC=VC14.20
|
||||||
|
|
||||||
rem Determine the VC14.2 path based on the installed edition in descending
|
rem Determine the VC14.2 path based on the installed edition in descending
|
||||||
rem order (Enterprise, then Professional and finally Community)
|
rem order (Enterprise, then Professional and finally Community)
|
||||||
|
@ -101,7 +101,7 @@ rem ***************************************************************************
|
||||||
)
|
)
|
||||||
) else if /i "%~1" == "vc14.3" (
|
) else if /i "%~1" == "vc14.3" (
|
||||||
set VC_VER=14.3
|
set VC_VER=14.3
|
||||||
set VC_DESC=VC14.3
|
set VC_DESC=VC14.30
|
||||||
|
|
||||||
rem Determine the VC14.3 path based on the installed edition in descending
|
rem Determine the VC14.3 path based on the installed edition in descending
|
||||||
rem order (Enterprise, then Professional and finally Community)
|
rem order (Enterprise, then Professional and finally Community)
|
||||||
|
|
|
@ -78,7 +78,7 @@ rem ***************************************************************************
|
||||||
set "VC_PATH=Microsoft Visual Studio 14.0\VC"
|
set "VC_PATH=Microsoft Visual Studio 14.0\VC"
|
||||||
) else if /i "%~1" == "vc14.1" (
|
) else if /i "%~1" == "vc14.1" (
|
||||||
set VC_VER=14.1
|
set VC_VER=14.1
|
||||||
set VC_DESC=VC14.1
|
set VC_DESC=VC14.10
|
||||||
set VC_TOOLSET=v141
|
set VC_TOOLSET=v141
|
||||||
|
|
||||||
rem Determine the VC14.1 path based on the installed edition in descending
|
rem Determine the VC14.1 path based on the installed edition in descending
|
||||||
|
@ -92,7 +92,7 @@ rem ***************************************************************************
|
||||||
)
|
)
|
||||||
) else if /i "%~1" == "vc14.2" (
|
) else if /i "%~1" == "vc14.2" (
|
||||||
set VC_VER=14.2
|
set VC_VER=14.2
|
||||||
set VC_DESC=VC14.2
|
set VC_DESC=VC14.20
|
||||||
set VC_TOOLSET=v142
|
set VC_TOOLSET=v142
|
||||||
|
|
||||||
rem Determine the VC14.2 path based on the installed edition in descending
|
rem Determine the VC14.2 path based on the installed edition in descending
|
||||||
|
@ -106,7 +106,7 @@ rem ***************************************************************************
|
||||||
)
|
)
|
||||||
) else if /i "%~1" == "vc14.3" (
|
) else if /i "%~1" == "vc14.3" (
|
||||||
set VC_VER=14.3
|
set VC_VER=14.3
|
||||||
set VC_DESC=VC14.3
|
set VC_DESC=VC14.30
|
||||||
set VC_TOOLSET=v143
|
set VC_TOOLSET=v143
|
||||||
|
|
||||||
rem Determine the VC14.3 path based on the installed edition in descending
|
rem Determine the VC14.3 path based on the installed edition in descending
|
||||||
|
|
Loading…
Reference in New Issue
Block a user