From aea8ac14df03732e16d2dd98fa0924ed96183812 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Wed, 8 Jun 2022 17:18:14 -0700 Subject: [PATCH] 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 --- projects/build-openssl.bat | 6 +++--- projects/build-wolfssl.bat | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat index 36d5b14ed6..1d75444e35 100644 --- a/projects/build-openssl.bat +++ b/projects/build-openssl.bat @@ -75,7 +75,7 @@ rem *************************************************************************** set "VC_PATH=Microsoft Visual Studio 14.0\VC" ) else if /i "%~1" == "vc14.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 order (Enterprise, then Professional and finally Community) @@ -88,7 +88,7 @@ rem *************************************************************************** ) ) else if /i "%~1" == "vc14.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 order (Enterprise, then Professional and finally Community) @@ -101,7 +101,7 @@ rem *************************************************************************** ) ) else if /i "%~1" == "vc14.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 order (Enterprise, then Professional and finally Community) diff --git a/projects/build-wolfssl.bat b/projects/build-wolfssl.bat index 02549b4a85..61f4a03091 100644 --- a/projects/build-wolfssl.bat +++ b/projects/build-wolfssl.bat @@ -78,7 +78,7 @@ rem *************************************************************************** set "VC_PATH=Microsoft Visual Studio 14.0\VC" ) else if /i "%~1" == "vc14.1" ( set VC_VER=14.1 - set VC_DESC=VC14.1 + set VC_DESC=VC14.10 set VC_TOOLSET=v141 rem Determine the VC14.1 path based on the installed edition in descending @@ -92,7 +92,7 @@ rem *************************************************************************** ) ) else if /i "%~1" == "vc14.2" ( set VC_VER=14.2 - set VC_DESC=VC14.2 + set VC_DESC=VC14.20 set VC_TOOLSET=v142 rem Determine the VC14.2 path based on the installed edition in descending @@ -106,7 +106,7 @@ rem *************************************************************************** ) ) else if /i "%~1" == "vc14.3" ( set VC_VER=14.3 - set VC_DESC=VC14.3 + set VC_DESC=VC14.30 set VC_TOOLSET=v143 rem Determine the VC14.3 path based on the installed edition in descending -- 2.47.3