merged RC_1_1 into master

This commit is contained in:
arvidn 2018-11-25 16:36:54 +01:00
commit 778b132790
1 changed files with 17 additions and 35 deletions

52
Jamfile
View File

@ -547,44 +547,26 @@ lib shell32 : : <name>shell32 ;
lib gdi32 : : <name>gdi32 ; lib gdi32 : : <name>gdi32 ;
lib z : : <link>shared <name>z ; lib z : : <link>shared <name>z ;
# windows variants for libssl and libcrypto (they have different names and some # openssl libraries on windows
# additional dependencies) alias ssl-deps : advapi32 user32 shell32 gdi32 ;
lib crypto
: # sources
: # requirements
<target-os>windows
<openssl-version>pre1.1
<name>libeay32
<conditional>@openssl-lib-path
: # default-build
: # usage-requirements
<conditional>@openssl-include-path
<library>advapi32
<library>user32
<library>shell32
<library>gdi32
;
lib ssl # pre OpenSSL 1.1 windows
: # sources lib crypto : ssl-deps : <target-os>windows <openssl-version>pre1.1 <name>libeay32
: # requirements <conditional>@openssl-lib-path : : <conditional>@openssl-include-path ;
<target-os>windows lib ssl : ssl-deps : <target-os>windows <openssl-version>pre1.1 <name>ssleay32
<openssl-version>pre1.1 <use>crypto <conditional>@openssl-lib-path : : <conditional>@openssl-include-path ;
<name>ssleay32
<use>crypto
<conditional>@openssl-lib-path
: # default-build
: # usage-requirments
<conditional>@openssl-include-path
<library>advapi32
<library>user32
<library>shell32
<library>gdi32
;
# OpenSSL 1.1+ windows
lib crypto : ssl-deps : <target-os>windows <name>libcrypto
<conditional>@openssl-lib-path : : <conditional>@openssl-include-path ;
lib ssl : ssl-deps : <target-os>windows <name>libssl <use>crypto
<conditional>@openssl-lib-path : : <conditional>@openssl-include-path ;
lib crypto : : <name>crypto <use>z <conditional>@openssl-lib-path : : <conditional>@openssl-include-path ; # generic OpenSSL
lib ssl : : <name>ssl <use>crypto <conditional>@openssl-lib-path : : <conditional>@openssl-include-path ; lib crypto : : <name>crypto <use>z <conditional>@openssl-lib-path : :
<conditional>@openssl-include-path ;
lib ssl : : <name>ssl <use>crypto <conditional>@openssl-lib-path : :
<conditional>@openssl-include-path ;
lib dbghelp : : <name>dbghelp ; lib dbghelp : : <name>dbghelp ;