forked from premiere/premiere-libtorrent
fix boost-link semantics. If it's not specified, it's the default: whatever link is set to
This commit is contained in:
parent
a854fed12b
commit
4b04aceccd
12
Jamfile
12
Jamfile
|
@ -234,12 +234,19 @@ rule linking ( properties * )
|
|||
}
|
||||
|
||||
}
|
||||
else
|
||||
else if <boost-link>shared in $(properties)
|
||||
{
|
||||
result += <library>boost_system/<link>shared ;
|
||||
result += <library>boost_chrono/<link>shared ;
|
||||
result += <library>boost_random/<link>shared ;
|
||||
}
|
||||
else
|
||||
{
|
||||
result += <library>boost_system ;
|
||||
result += <library>boost_chrono ;
|
||||
result += <library>boost_random ;
|
||||
}
|
||||
|
||||
result += <define>BOOST_ALL_NO_LIB
|
||||
<define>BOOST_MULTI_INDEX_DISABLE_SERIALIZATION
|
||||
;
|
||||
|
@ -493,7 +500,7 @@ feature.compose <character-set>unicode : <define>_UNICODE <define>UNICODE ;
|
|||
feature deprecated-functions : on off : composite propagated link-incompatible ;
|
||||
feature.compose <deprecated-functions>off : <define>TORRENT_NO_DEPRECATE ;
|
||||
|
||||
feature boost-link : static shared : propagated composite ;
|
||||
feature boost-link : default static shared : propagated composite ;
|
||||
|
||||
feature debug-iterators : off on : composite propagated link-incompatible ;
|
||||
feature.compose <debug-iterators>on : <define>_SCL_SECURE=1 <define>_GLIBCXX_DEBUG ;
|
||||
|
@ -770,7 +777,6 @@ lib torrent
|
|||
$(usage-requirements)
|
||||
|
||||
: # default build
|
||||
<link>static
|
||||
<threading>multi
|
||||
|
||||
: # usage requirements
|
||||
|
|
Loading…
Reference in New Issue