This is an automated email from the ASF dual-hosted git repository. damjan pushed a commit to branch windows-amd64 in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit ceb9a1253b970a2e0a3eb6c1810f24dfbb12ce38 Author: Damjan Jovanovic <[email protected]> AuthorDate: Sat Feb 15 18:38:34 2025 +0200 Fix the OpenSSL packaging on Windows. The CPUNAME must be added to SCPDEFS. Patch by: me --- main/scp2/source/ooo/file_library_ooo.scp | 4 ++-- main/scp2/source/ooo/makefile.mk | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/main/scp2/source/ooo/file_library_ooo.scp b/main/scp2/source/ooo/file_library_ooo.scp index 229277ed63..6ca0f848e7 100644 --- a/main/scp2/source/ooo/file_library_ooo.scp +++ b/main/scp2/source/ooo/file_library_ooo.scp @@ -1774,7 +1774,7 @@ File gid_File_Lib_Openssl TXT_FILE_BODY; Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; - #if defined(WNT) && defined(X86) + #if defined(WNT) && defined(INTEL) Name = "libssl-3.dll"; #elif defined(WNT) && defined(X86_64) Name = "libssl-3-x64.dll"; @@ -1789,7 +1789,7 @@ File gid_File_Lib_Crypto TXT_FILE_BODY; Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; - #if defined(WNT) && defined(X86) + #if defined(WNT) && defined(INTEL) Name = "libcrypto-3.dll"; #elif defined(WNT) && defined(X86_64) Name = "libcrypto-3-x64.dll"; diff --git a/main/scp2/source/ooo/makefile.mk b/main/scp2/source/ooo/makefile.mk index 7fdbc1cb7d..c7b34e7880 100644 --- a/main/scp2/source/ooo/makefile.mk +++ b/main/scp2/source/ooo/makefile.mk @@ -37,6 +37,8 @@ TARGETTYPE=CUI SCPDEFS+=-D_MSC .ENDIF +SCPDEFS+=-D$(CPUNAME) + .IF "$(BUILD_SPECIAL)"!="" SCPDEFS+=-DBUILD_SPECIAL .ENDIF
