From a4df34294f1e7437918935f0e611f1ef1c22a0fc Mon Sep 17 00:00:00 2001
From: Steve Holme <steve_holme@hotmail.com>
Date: Sat, 6 Apr 2019 22:46:30 +0100
Subject: build-openssl.bat: Perform the install for each build type directly
 after the build

---
 projects/build-openssl.bat | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

(limited to 'projects')

diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat
index 5f849dd7d..f7b450aae 100644
--- a/projects/build-openssl.bat
+++ b/projects/build-openssl.bat
@@ -239,12 +239,16 @@ rem ***************************************************************************
   rem Configuring 64-bit Debug Build
   call :configure x64 debug
 
-  rem Perform the build
+  rem Perform the static library build
   call :build x64 static
-  call :build x64 shared
 
-  rem Perform the install
+  rem Perform the static library install
   call :install debug static
+
+  rem Perform the 64-bit shared library build
+  call :build x64 shared
+
+  rem Perform the shared library install
   call :install debug shared
 
   if "%BUILD_CONFIG%" == "debug" goto success
@@ -253,12 +257,16 @@ rem ***************************************************************************
   rem Configuring 64-bit Release Build
   call :configure x64 release
 
-  rem Perform the build
+  rem Perform the static library build
   call :build x64 static
-  call :build x64 shared
 
-  rem Perform the install
+  rem Perform the static library install
   call :install release static
+
+  rem Perform the shared library build
+  call :build x64 shared
+
+  rem Perform the shared library install
   call :install release shared
 
   goto success
@@ -274,12 +282,16 @@ rem ***************************************************************************
   rem Configuring 32-bit Debug Build
   call :configure x86 debug
 
-  rem Perform the build
+  rem Perform the static library build
   call :build x86 static
-  call :build x86 shared
 
-  rem Perform the install
+  rem Perform the static library install
   call :install debug static
+
+  rem Perform the shared library build
+  call :build x86 shared
+
+  rem Perform the shared library install
   call :install debug shared
 
   if "%BUILD_CONFIG%" == "debug" goto success
@@ -288,12 +300,16 @@ rem ***************************************************************************
   rem Configuring 32-bit Release Build
   call :configure x86 release
 
-  rem Perform the build
+  rem Perform the static library build
   call :build x86 static
-  call :build x86 shared
 
-  rem Perform the install
+  rem Perform the static library install
   call :install release static
+
+  rem Perform the shared library build
+  call :build x86 shared
+
+  rem Perform the shared library install
   call :install release shared
 
   goto success
-- 
cgit v1.2.3