From 43f28d68ae95ae6940a8b80e10bf065ddd590ffd Mon Sep 17 00:00:00 2001 From: arvidn Date: Fri, 23 Nov 2018 17:14:18 +0100 Subject: [PATCH] fix Jamfile for linking against openssl 1.1+ on windows --- Jamfile | 50 +++++++++++++++++--------------------------------- 1 file changed, 17 insertions(+), 33 deletions(-) diff --git a/Jamfile b/Jamfile index b81241fcd..13a1b90bf 100644 --- a/Jamfile +++ b/Jamfile @@ -568,42 +568,26 @@ lib shell32 : : shell32 ; lib gdi32 : : gdi32 ; lib z : : shared z ; -lib crypto - : # sources - : # requirements - windows - pre1.1 - libeay32 - @openssl-lib-path - : # default-build - : # usage-requirements - @openssl-include-path - advapi32 - user32 - shell32 - gdi32 - ; +# openssl libraries on windows +alias ssl-deps : advapi32 user32 shell32 gdi32 ; -lib ssl - : # sources - : # requirements - windows - pre1.1 - ssleay32 - crypto - @openssl-lib-path - : # default-build - : # usage-requirments - @openssl-include-path - advapi32 - user32 - shell32 - gdi32 - ; +# pre OpenSSL 1.1 windows +lib crypto : ssl-deps : windows pre1.1 libeay32 + @openssl-lib-path : : @openssl-include-path ; +lib ssl : ssl-deps : windows pre1.1 ssleay32 + crypto @openssl-lib-path : : @openssl-include-path ; +# OpenSSL 1.1+ windows +lib crypto : ssl-deps : windows libcrypto + @openssl-lib-path : : @openssl-include-path ; +lib ssl : ssl-deps : windows libssl crypto + @openssl-lib-path : : @openssl-include-path ; -lib crypto : : crypto z @openssl-lib-path : : @openssl-include-path ; -lib ssl : : ssl crypto @openssl-lib-path : : @openssl-include-path ; +# generic OpenSSL +lib crypto : : crypto z @openssl-lib-path : : + @openssl-include-path ; +lib ssl : : ssl crypto @openssl-lib-path : : + @openssl-include-path ; lib dbghelp : : dbghelp ;