diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2018-02-08 22:05:31 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2019-04-08 22:36:22 +0100 |
| commit | ac690c42854e00deca7581a189119e9e5053fcdf (patch) | |
| tree | 6306a412d7560c3e252a492e7684b0549be150b0 /projects | |
| parent | 1f6ec5babac0ee91e81bec41b5c03c70b93d31ae (diff) | |
| download | curl-ac690c42854e00deca7581a189119e9e5053fcdf.tar.gz | |
build-openssl.bat: Move the build step into a separate function
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/build-openssl.bat | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat index b976507a7..46cbd7eb2 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. |