You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openoffice.apache.org by da...@apache.org on 2025/01/02 06:42:24 UTC

(openoffice) 02/09: Use the new OpenSSL DLL names on Win64.

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

damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit d35e03cba9f0961e825e53a014d8c2bb6033dd17
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Tue Dec 31 19:53:47 2024 +0200

    Use the new OpenSSL DLL names on Win64.
    
    Patch by: me
---
 main/openssl/makefile.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/main/openssl/makefile.mk b/main/openssl/makefile.mk
index 45def9d385..470cd9fce1 100644
--- a/main/openssl/makefile.mk
+++ b/main/openssl/makefile.mk
@@ -171,13 +171,15 @@ OUT2BIN += out/libeay32.dll
 		perl configure $(NO_ASM)
 	.IF "$(CPUNAME)"=="INTEL"
 		CONFIGURE_FLAGS=VC-WIN32
+		OUT2BIN = libcrypto-3.dll
+		OUT2BIN += libssl-3.dll
 	.ELIF "$(CPUNAME)"=="X86_64"
 		CONFIGURE_FLAGS=VC-WIN64A
+		OUT2BIN = libcrypto-3-x64.dll
+		OUT2BIN += libssl-3-x64.dll
 	.ENDIF
 	BUILD_ACTION=LIB="$(ILIB)" nmake
 
-	OUT2BIN = libcrypto-3.dll
-	OUT2BIN += libssl-3.dll
 	OUT2INC = include$/openssl$/*
 
 .ENDIF # "$(COM)"=="GCC"