Revert "Update to 7.44.0"

[platform/upstream/curl.git] / projects / build-openssl.bat

diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat
index 19b7357..24410dc 100644 (file)
--- a/projects/build-openssl.bat
+++ b/projects/build-openssl.bat
@@ -24,14 +24,13 @@ rem ***************************************************************************
 :begin
   rem Check we are running on a Windows NT derived OS
   if not "%OS%" == "Windows_NT" goto nodos
-
-  rem Set our variables
   setlocal
-  set VC_VER=
-  set BUILD_PLATFORM=
-
-  rem Ensure we have the required arguments
+  
+  rem Display the help
   if /i "%~1" == "" goto syntax
+  if /i "%~1" == "-?" goto syntax
+  if /i "%~1" == "-h" goto syntax
+  if /i "%~1" == "-help" goto syntax
 
 :parseArgs
   if "%~1" == "" goto prerequisites
@@ -68,10 +67,6 @@ rem ***************************************************************************
     set VC_VER=12.0
     set VC_DESC=VC12
     set "VC_PATH=Microsoft Visual Studio 12.0\VC"
-  ) else if /i "%~1" == "vc14" (
-    set VC_VER=14.0
-    set VC_DESC=VC14
-    set "VC_PATH=Microsoft Visual Studio 14.0\VC"
   ) else if /i "%~1%" == "x86" (
     set BUILD_PLATFORM=x86
   ) else if /i "%~1%" == "x64" (
@@ -80,12 +75,6 @@ rem ***************************************************************************
     set BUILD_CONFIG=debug
   ) else if /i "%~1%" == "release" (
     set BUILD_CONFIG=release
-  ) else if /i "%~1" == "-?" (
-    goto syntax
-  ) else if /i "%~1" == "-h" (
-    goto syntax
-  ) else if /i "%~1" == "-help" (
-    goto syntax
   ) else (
     if not defined START_DIR (
       set START_DIR=%~1%
@@ -97,10 +86,6 @@ rem ***************************************************************************
   shift & goto parseArgs
 
 :prerequisites
-  rem Compiler and platform are required parameters.
-  if not defined VC_VER goto syntax
-  if not defined BUILD_PLATFORM goto syntax
-
   rem Default the start directory if one isn't specified
   if not defined START_DIR set START_DIR=..\..\openssl
 
@@ -121,12 +106,12 @@ rem ***************************************************************************
   if not exist "%PF%\%VC_PATH%" goto novc
 
   rem Check we have Perl installed
-  echo %PATH% | findstr /I /C:"\Perl" 1>nul
-  if errorlevel 1 (
-    if not exist "%SystemDrive%\Perl" (
-      if not exist "%SystemDrive%\Perl64" goto noperl
-    )
-  )
+  echo %PATH% | findstr /I /C:"\Perl" 1>nul\r
+  if errorlevel 1 (\r
+    if not exist "%SystemDrive%\Perl" (\r
+      if not exist "%SystemDrive%\Perl64" goto noperl\r
+    )\r
+  )\r
 
   rem Check the start directory exists
   if not exist "%START_DIR%" goto noopenssl
@@ -155,7 +140,6 @@ rem ***************************************************************************
     if "%VC_VER%" == "10.0" set VCVARS_PLATFORM=%BUILD_PLATFORM%
     if "%VC_VER%" == "11.0" set VCVARS_PLATFORM=amd64
     if "%VC_VER%" == "12.0" set VCVARS_PLATFORM=amd64
-    if "%VC_VER%" == "14.0" set VCVARS_PLATFORM=amd64
   )
 
 :start
@@ -180,7 +164,7 @@ rem ***************************************************************************
   set OUTDIR=build\Win64\%VC_DESC%
   if not exist %OUTDIR% md %OUTDIR%
 
-  if "%BUILD_CONFIG%" == "release" goto x64release
+  if "%BUILD_CONFIG%" == "release" goto x64release\r
 
 :x64debug
   rem Configuring 64-bit Debug Build
@@ -296,7 +280,6 @@ rem ***************************************************************************
   echo vc10      - Use Visual Studio 2010
   echo vc11      - Use Visual Studio 2012
   echo vc12      - Use Visual Studio 2013
-  echo vc14      - Use Visual Studio 2015
   echo.
   echo Platform:
   echo.