premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

merge

This commit is contained in:
arvidn 2015-06-07 01:34:12 -04:00
parent aa6598b2e6 2e0a5263ac
commit e584f476ba
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Jamfile
View File

@ -209,9 +209,18 @@ rule linking ( properties * )
} }
else else
{ {
result += <library>boost_system ; if <boost-link>static in $(properties)
result += <library>boost_chrono ; {
result += <library>boost_random ; result += <library>boost_system/<link>static ;
result += <library>boost_chrono/<link>static ;
result += <library>boost_random/<link>static ;
}
else
{
result += <library>boost_system/<link>shared ;
result += <library>boost_chrono/<link>shared ;
result += <library>boost_random/<link>shared ;
}
# on mac the boost headers are installed in # on mac the boost headers are installed in
# a directory that isn't automatically accessable # a directory that isn't automatically accessable
@ -475,9 +484,6 @@ feature.compose <character-set>unicode : <define>_UNICODE <define>UNICODE ;
feature deprecated-functions : on off : composite propagated link-incompatible ; feature deprecated-functions : on off : composite propagated link-incompatible ;
feature.compose <deprecated-functions>off : <define>TORRENT_NO_DEPRECATE ; feature.compose <deprecated-functions>off : <define>TORRENT_NO_DEPRECATE ;
feature upnp-logging : off on : composite propagated link-incompatible ;
feature.compose <upnp-logging>on : <define>TORRENT_UPNP_LOGGING ;
feature boost : system source : link-incompatible propagated ; feature boost : system source : link-incompatible propagated ;
feature boost-link : static shared : propagated composite ; feature boost-link : static shared : propagated composite ;
@ -560,7 +566,6 @@ lib z : : <link>shared <name>z <search>/usr/lib ;
lib crypto : : <name>crypto <link>shared <search>/usr/lib <use>z ; lib crypto : : <name>crypto <link>shared <search>/usr/lib <use>z ;
lib ssl : : <name>ssl <link>shared <use>crypto <search>/opt/local/lib ; lib ssl : : <name>ssl <link>shared <use>crypto <search>/opt/local/lib ;
lib dl : : <link>shared <name>dl ; lib dl : : <link>shared <name>dl ;
lib aio : : <link>shared <name>aio ;
# time functions used on linux require librt # time functions used on linux require librt
lib librt : : <name>rt <link>shared ; lib librt : : <name>rt <link>shared ;

8
bindings/python/Jamfile
View File

@ -12,10 +12,11 @@ lib boost_python : : <name>boost_python ;
feature visibility : default hidden : composite propagated link-incompatible ; feature visibility : default hidden : composite propagated link-incompatible ;
feature.compose <visibility>hidden : <cflags>-fvisibility=hidden <cxxflags>-fvisibility-inlines-hidden ; feature.compose <visibility>hidden : <cflags>-fvisibility=hidden <cxxflags>-fvisibility-inlines-hidden ;
feature libtorrent-link : shared static : ; feature libtorrent-link : shared static : composite propagated ;
feature libtorrent-python-pic : off on : composite propagated link-incompatible ; feature libtorrent-python-pic : off on : composite propagated link-incompatible ;
feature.compose <libtorrent-python-pic>on : <cflags>-fPIC ; feature.compose <libtorrent-python-pic>on : <cflags>-fPIC ;
rule libtorrent_linking ( properties * ) rule libtorrent_linking ( properties * )
{ {
local result ; local result ;
@ -134,9 +135,8 @@ my-python-extension libtorrent
: # requirements : # requirements
<include>src <include>src
<conditional>@libtorrent_linking <conditional>@libtorrent_linking
: # default build : # usage-requirements
<boost-link>static <conditional>@libtorrent_linking
<libtorrent-link>shared
<suppress-import-lib>false <suppress-import-lib>false
; ;