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

Jamfile updates to add the option to link statically or dynamically against the boost libraries

This commit is contained in:
Arvid Norberg 2008-06-28 08:59:25 +00:00
parent ae1af66724
commit 13766dc855
3 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Jamfile
View File

@ -108,13 +108,26 @@ rule linking ( properties * )
if <boost>source in $(properties) if <boost>source in $(properties)
{ {
result += <library>/boost/thread//boost_thread if <boost-link>static in $(properties)
<library>/boost/filesystem//boost_filesystem {
<library>/boost/iostreams//boost_iostreams result += <library>/boost/thread//boost_thread/<link>static
<library>/boost/system//boost_system <library>/boost/filesystem//boost_filesystem/<link>static
<include>$(BOOST_ROOT) <library>/boost/iostreams//boost_iostreams/<link>static
<define>BOOST_ALL_NO_LIB <library>/boost/system//boost_system/<link>static
; <include>$(BOOST_ROOT)
<define>BOOST_ALL_NO_LIB
;
}
else
{
result += <library>/boost/thread//boost_thread/<link>shared
<library>/boost/filesystem//boost_filesystem/<link>shared
<library>/boost/iostreams//boost_iostreams/<link>shared
<library>/boost/system//boost_system/<link>shared
<include>$(BOOST_ROOT)
<define>BOOST_ALL_NO_LIB
;
}
} }
if <boost>system in $(properties) if <boost>system in $(properties)
@ -228,6 +241,7 @@ feature upnp-logging : off on : composite propagated link-incompatible ;
feature.compose <upnp-logging>on : <define>TORRENT_UPNP_LOGGING ; 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 : composite ;
feature debug-iterators : off on : composite propagated link-incompatible ; feature debug-iterators : off on : composite propagated link-incompatible ;
feature.compose <debug-iterators>on : <define>_SCL_SECURE=1 <define>_GLIBCXX_DEBUG ; feature.compose <debug-iterators>on : <define>_SCL_SECURE=1 <define>_GLIBCXX_DEBUG ;

5
bindings/python/Jamfile
View File

@ -27,7 +27,8 @@ python-extension libtorrent
src/ip_filter.cpp src/ip_filter.cpp
: <include>src : <include>src
<boost>system:<library>boost_python <boost>system:<library>boost_python
<boost>source:<library>/boost/python//boost_python <boost>source,<boost-link>static:<library>/boost/python//boost_python/<link>static
<library>/torrent//torrent <boost>source,<boost-link>shared:<library>/boost/python//boost_python/<link>shared
<library>/torrent//torrent/<link>static
; ;

5
docs/building.rst
View File

@ -226,6 +226,11 @@ Build features:
| | ``BOOST_ROOT`` must be defined to point to the | | | ``BOOST_ROOT`` must be defined to point to the |
| | boost directory. | | | boost directory. |
+------------------------+----------------------------------------------------+ +------------------------+----------------------------------------------------+
| ``boost-link`` | * ``static`` - links statically against the boost |
| | libraries. |
| | * ``shared`` - links dynamically against the boost |
| | libraries. |
+------------------------+----------------------------------------------------+
| ``logging`` | * ``none`` - no logging. | | ``logging`` | * ``none`` - no logging. |
| | * ``default`` - basic session logging. | | | * ``default`` - basic session logging. |
| | * ``verbose`` - verbose peer wire logging. | | | * ``verbose`` - verbose peer wire logging. |