This is an automated email from the ASF dual-hosted git repository. ardovm pushed a commit to branch serf in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit cefe9c86ed30ea3ea2336b485cf6d2220d3628f3 Author: Arrigo Marchiori <[email protected]> AuthorDate: Wed Nov 24 21:51:33 2021 +0100 Whoops: actually install Windows binaries --- main/openssl/makefile.mk | 8 ++++++++ main/openssl/prj/d.lst | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/main/openssl/makefile.mk b/main/openssl/makefile.mk index 92add0b..8fab390 100644 --- a/main/openssl/makefile.mk +++ b/main/openssl/makefile.mk @@ -128,6 +128,8 @@ OUT2LIB = libcrypto_static.* OUT2LIB += libssl_static.* OUT2LIB += libcrypto.* OUT2LIB += libssl.* +OUT2BIN = libssl*.dll +OUT2BIN += libcrypto*.dll .ELSE CONFIGURE_ACTION= BUILD_ACTION=cmd /c "ms\mingw32" @@ -135,6 +137,8 @@ OUT2LIB = out/libcrypto_static.* OUT2LIB += out/libssl_static.* OUT2LIB += out/libcrypto.* OUT2LIB += out/libssl.* +OUT2BIN = out/libssl*.dll +OUT2BIN += out/libcrypto*.dll .ENDIF .ELSE @@ -162,6 +166,10 @@ OUT2LIB += out/libssl.* CONFIGURE_ACTION=CONFIGURE_INSIST=1 $(PERL) configure $(NO_ASM) CONFIGURE_FLAGS=VC-WIN64A .ENDIF + OUT2LIB = libssl.lib + OUT2LIB += libcrypto.lib + OUT2BIN = libssl*.dll + OUT2BIN += libcrypto*.dll BUILD_ACTION=nmake .ENDIF .ENDIF diff --git a/main/openssl/prj/d.lst b/main/openssl/prj/d.lst index 6b67f0f..55cc5bb 100644 --- a/main/openssl/prj/d.lst +++ b/main/openssl/prj/d.lst @@ -1,10 +1,10 @@ mkdir: %_DEST%\inc%_EXT%\external mkdir: %_DEST%\inc%_EXT%\external\openssl ..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\openssl -..\%__SRC%\lib\ssleay32.lib %_DEST%\lib%_EXT%\ssleay32.lib -..\%__SRC%\bin\ssleay32.dll %_DEST%\bin%_EXT%\ssleay32.dll -..\%__SRC%\lib\libeay32.lib %_DEST%\lib%_EXT%\libeay32.lib -..\%__SRC%\bin\libeay32.dll %_DEST%\bin%_EXT%\libeay32.dll +..\%__SRC%\lib\libssl.lib %_DEST%\lib%_EXT%\libssl.lib +..\%__SRC%\bin\libssl-1_1.dll %_DEST%\bin%_EXT%\libssl-1_1.dll +..\%__SRC%\lib\libcrypto.lib %_DEST%\lib%_EXT%\libcrypto.lib +..\%__SRC%\bin\libcrypto-1_1.dll %_DEST%\bin%_EXT%\libcrypto-1_1.dll ..\%__SRC%\lib\libcrypto.a %_DEST%\lib%_EXT%\libcrypto.a ..\%__SRC%\lib\libssl.a %_DEST%\lib%_EXT%\libssl.a
