[tomcat-native] branch master updated: Update building notes for Windows

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git


The following commit(s) were added to refs/heads/master by this push:
     new 97f8a0c  Update building notes for Windows
97f8a0c is described below

commit 97f8a0c47f545971f67f0a3f5e25d7a750e6e479
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Apr 24 19:56:12 2020 +0100

    Update building notes for Windows
---
 native/srclib/BUILDING | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/native/srclib/BUILDING b/native/srclib/BUILDING
index ca06645..c116a11 100644
--- a/native/srclib/BUILDING
+++ b/native/srclib/BUILDING
@@ -15,36 +15,17 @@ environment before calling nmake so that correct
 compiler is setup for the target architecture.
 
 
-Building OpenSSL 1.1.0 and earlier
+Building OpenSSL 1.1.1 and later
 ----------------------------------
 
-Apply openssl-msvcrt.patch
+Apply openssl-msvcrt-1.1.1.patch
 
 This patch makes sure that static version of OpenSSL libraries
 is linked to msvcrt.dll instead statically linking msvcrt.
 Without that patch it won't be possible to create statically linked
 Tomcat native .dll
-
-Then follow the standard OpenSSL make procedure ...
-
-> perl Configure VC-WIN32
-> ms\do_nasm
-> nmake -f ms\nt.mak
-
-For 64-bit Windows use
-> perl Configure VC-WIN64A
-> ms\do_win64a
-> nmake -f ms\nt.mak
-
-
-Building OpenSSL 1.1.1 and later
-----------------------------------
-
-Apply openssl-msvcrt-1.1.1.patch
-
-This patch addresses issues caused by CMSC compiling against an older Windows
-API than expected for the compiler version in additional to the static linking
-issues described above.
+This patch also addresses issues caused by CMSC compiling against an older Windows
+API than expected for the compiler version.
 
 Then follow the standard OpenSSL make procedure ...
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org