From be033641c2ce1e3be65a2340487849c40c600f64 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Mon, 5 Feb 2018 21:18:35 +0000 Subject: build-openssl.bat: Extend VC15 support to include Enterprise and Professional ...and not just the Community Edition. --- projects/build-openssl.bat | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'projects') diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat index 2a135b910..6389e87a5 100644 --- a/projects/build-openssl.bat +++ b/projects/build-openssl.bat @@ -6,7 +6,7 @@ rem * / __| | | | |_) | | rem * | (__| |_| | _ <| |___ rem * \___|\___/|_| \_\_____| rem * -rem * Copyright (C) 2012 - 2017, Steve Holme, . +rem * Copyright (C) 2012 - 2018, Steve Holme, . 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 @@ -33,6 +33,16 @@ rem *************************************************************************** rem Ensure we have the required arguments if /i "%~1" == "" goto syntax + rem Calculate the program files directory + if defined PROGRAMFILES ( + set "PF=%PROGRAMFILES%" + set OS_PLATFORM=x86 + ) + if defined PROGRAMFILES(x86) ( + set "PF=%PROGRAMFILES(x86)%" + set OS_PLATFORM=x64 + ) + :parseArgs if "%~1" == "" goto prerequisites @@ -75,7 +85,16 @@ rem *************************************************************************** ) else if /i "%~1" == "vc15" ( set VC_VER=15.0 set VC_DESC=VC15 - set "VC_PATH=Microsoft Visual Studio\2017\Community\VC" + + rem Determine the VC15 path based on the installed edition in decending + rem order (Enterprise, then Professional and finally Community) + if exist "%PF%\Microsoft Visual Studio\2017\Enterprise\VC" ( + set "VC_PATH=Microsoft Visual Studio\2017\Enterprise\VC" + ) else if exist "%PF%\Microsoft Visual Studio\2017\Professional\VC" ( + set "VC_PATH=Microsoft Visual Studio\2017\Professional\VC" + ) else ( + set "VC_PATH=Microsoft Visual Studio\2017\Community\VC" + ) ) else if /i "%~1%" == "x86" ( set BUILD_PLATFORM=x86 ) else if /i "%~1%" == "x64" ( @@ -108,16 +127,6 @@ rem *************************************************************************** rem Default the start directory if one isn't specified if not defined START_DIR set START_DIR=..\..\openssl - rem Calculate the program files directory - if defined PROGRAMFILES ( - set "PF=%PROGRAMFILES%" - set OS_PLATFORM=x86 - ) - if defined PROGRAMFILES(x86) ( - set "PF=%PROGRAMFILES(x86)%" - set OS_PLATFORM=x64 - ) - rem Check we have a program files directory if not defined PF goto nopf -- cgit v1.2.3