jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

landed ssl branch back into trunk

Browse Source
This commit is contained in:
Arvid Norberg
2012-01-14 16:04:25 +00:00
parent cbe02221cd
commit 4a40e68a82
20 changed files with 737 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Jamfile
View File

@@ -65,7 +65,7 @@ rule linking ( properties * )
}
# gcrypt libraries, if enabled
if <encryption>gcrypt in $(properties)
if <encryption>gcrypt in $(properties) || <encryption>openssl in $(properties)
{
# on mac os x, adding the /opt/local/include path
# would include openssl headers incompatible with
@@ -371,7 +371,7 @@ lib boost_system : : <name>boost_system ;
lib gcrypt : : <name>gcrypt <link>shared <search>/opt/local/lib ;
lib z : : <link>shared <name>z <search>/lib ;
lib crypto : : <name>crypto <search>/lib <use>z ;
lib ssl : : <name>ssl <link>shared <use>crypto ;
lib ssl : : <name>ssl <link>shared <use>crypto <search>/opt/local/lib ;
lib dl : : <link>shared <name>dl ;
# time functions used on linux require librt