moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 17:31:46 -05:00
Code Issues Releases Wiki Activity

build-openssl.bat: Extend VC15 support to include Enterprise and Professional

Browse Source 
...and not just the Community Edition.
This commit is contained in:
Steve Holme 2018-02-05 21:18:35 +00:00
parent d25b050379
commit be033641c2
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
projects/build-openssl.bat
View File

@ -6,7 +6,7 @@ rem * / __| | | | |_) | |
rem * | (__| |_| | _ <| |___ rem * | (__| |_| | _ <| |___
rem * \___|\___/|_| \_\_____| rem * \___|\___/|_| \_\_____|
rem * rem *
rem * Copyright (C) 2012 - 2017, Steve Holme, <steve_holme@hotmail.com>. rem * Copyright (C) 2012 - 2018, Steve Holme, <steve_holme@hotmail.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
rem * you should have received as part of this distribution. The terms rem * you should have received as part of this distribution. The terms
@ -33,6 +33,16 @@ rem ***************************************************************************
rem Ensure we have the required arguments rem Ensure we have the required arguments
if /i "%~1" == "" goto syntax 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 :parseArgs
if "%~1" == "" goto prerequisites if "%~1" == "" goto prerequisites
@ -75,7 +85,16 @@ rem ***************************************************************************
) else if /i "%~1" == "vc15" ( ) else if /i "%~1" == "vc15" (
set VC_VER=15.0 set VC_VER=15.0
set VC_DESC=VC15 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" ( ) else if /i "%~1%" == "x86" (
set BUILD_PLATFORM=x86 set BUILD_PLATFORM=x86
) else if /i "%~1%" == "x64" ( ) else if /i "%~1%" == "x64" (
@ -108,16 +127,6 @@ rem ***************************************************************************
rem Default the start directory if one isn't specified rem Default the start directory if one isn't specified
if not defined START_DIR set START_DIR=..\..\openssl 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 rem Check we have a program files directory
if not defined PF goto nopf if not defined PF goto nopf