From: Steve Holme <steve_holme@hotmail.com>
Date: Thu, 8 Feb 2018 22:05:31 +0000 (+0000)
Subject: build-openssl.bat: Move the build step into a separate function
X-Git-Tag: curl-7_65_0~184
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac690c42854e00deca7581a189119e9e5053fcdf;p=thirdparty%2Fcurl.git

build-openssl.bat: Move the build step into a separate function
---

diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat
index b976507a7d..46cbd7eb2d 100644
--- a/projects/build-openssl.bat
+++ b/projects/build-openssl.bat
@@ -240,9 +240,7 @@ rem ***************************************************************************
   call :configure x64 debug
 
   rem Perform the build
-  call ms\do_win64a
-  nmake -f ms\nt.mak
-  nmake -f ms\ntdll.mak
+  call :build x64
 
   rem Move the output directories
   if exist "%OUTDIR%\LIB Debug" (
@@ -273,9 +271,7 @@ rem ***************************************************************************
   call :configure x64 release
 
   rem Perform the build
-  call ms\do_win64a
-  nmake -f ms\nt.mak
-  nmake -f ms\ntdll.mak
+  call :build x64
 
   rem Move the output directories
   if exist "%OUTDIR%\LIB Release" (
@@ -313,9 +309,7 @@ rem ***************************************************************************
   call :configure x86 debug
 
   rem Perform the build
-  call ms\do_ms
-  nmake -f ms\nt.mak
-  nmake -f ms\ntdll.mak
+  call :build x86
 
   rem Move the output directories
   if exist "%OUTDIR%\LIB Debug" (
@@ -346,9 +340,7 @@ rem ***************************************************************************
   call :configure x86 release
 
   rem Perform the build
-  call ms\do_ms
-  nmake -f ms\nt.mak
-  nmake -f ms\ntdll.mak
+  call :build x86
 
   rem Move the output directories
   if exist "%OUTDIR%\LIB Release" (
@@ -414,6 +406,28 @@ rem
 
   exit /B %ERRORLEVEL
 
+rem Main build function.
+rem
+rem %1 - Platform (x86 or x64)
+rem
+:build
+  setlocal
+
+  if "%1" == "" exit /B 1
+
+  if "%1" == "x86" (
+    call ms\do_ms.bat
+  ) else if "%1" == "x64" (
+    call ms\do_win64a.bat
+  ) else (
+    exit /B 1
+  )
+
+  nmake -f ms\nt.mak
+  nmake -f ms\ntdll.mak
+
+  exit /B 0
+
 :syntax
   rem Display the help
   echo.