mirror of
https://github.com/curl/curl.git
synced 2025-09-17 09:32:48 +03:00
build-openssl.bat: Move the build step into a separate function
This commit is contained in:
parent
1f6ec5baba
commit
ac690c4285
|
@ -240,9 +240,7 @@ rem ***************************************************************************
|
||||||
call :configure x64 debug
|
call :configure x64 debug
|
||||||
|
|
||||||
rem Perform the build
|
rem Perform the build
|
||||||
call ms\do_win64a
|
call :build x64
|
||||||
nmake -f ms\nt.mak
|
|
||||||
nmake -f ms\ntdll.mak
|
|
||||||
|
|
||||||
rem Move the output directories
|
rem Move the output directories
|
||||||
if exist "%OUTDIR%\LIB Debug" (
|
if exist "%OUTDIR%\LIB Debug" (
|
||||||
|
@ -273,9 +271,7 @@ rem ***************************************************************************
|
||||||
call :configure x64 release
|
call :configure x64 release
|
||||||
|
|
||||||
rem Perform the build
|
rem Perform the build
|
||||||
call ms\do_win64a
|
call :build x64
|
||||||
nmake -f ms\nt.mak
|
|
||||||
nmake -f ms\ntdll.mak
|
|
||||||
|
|
||||||
rem Move the output directories
|
rem Move the output directories
|
||||||
if exist "%OUTDIR%\LIB Release" (
|
if exist "%OUTDIR%\LIB Release" (
|
||||||
|
@ -313,9 +309,7 @@ rem ***************************************************************************
|
||||||
call :configure x86 debug
|
call :configure x86 debug
|
||||||
|
|
||||||
rem Perform the build
|
rem Perform the build
|
||||||
call ms\do_ms
|
call :build x86
|
||||||
nmake -f ms\nt.mak
|
|
||||||
nmake -f ms\ntdll.mak
|
|
||||||
|
|
||||||
rem Move the output directories
|
rem Move the output directories
|
||||||
if exist "%OUTDIR%\LIB Debug" (
|
if exist "%OUTDIR%\LIB Debug" (
|
||||||
|
@ -346,9 +340,7 @@ rem ***************************************************************************
|
||||||
call :configure x86 release
|
call :configure x86 release
|
||||||
|
|
||||||
rem Perform the build
|
rem Perform the build
|
||||||
call ms\do_ms
|
call :build x86
|
||||||
nmake -f ms\nt.mak
|
|
||||||
nmake -f ms\ntdll.mak
|
|
||||||
|
|
||||||
rem Move the output directories
|
rem Move the output directories
|
||||||
if exist "%OUTDIR%\LIB Release" (
|
if exist "%OUTDIR%\LIB Release" (
|
||||||
|
@ -414,6 +406,28 @@ rem
|
||||||
|
|
||||||
exit /B %ERRORLEVEL
|
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
|
:syntax
|
||||||
rem Display the help
|
rem Display the help
|
||||||
echo.
|
echo.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user