merged jamfile fixes from RC_0_16

This commit is contained in:
Arvid Norberg
2013-04-27 19:35:41 +00:00
parent b4161aea6e
commit 7632393325
2 changed files with 15 additions and 5 deletions

View File

@@ -15,22 +15,30 @@ rule libtorrent_linking ( properties * )
}
if <toolset>gcc in $(properties)
|| <toolset>darwin in $(properties)
|| <toolset>clang in $(properties)
|| <toolset>darwin in $(properties)
|| <toolset>clang in $(properties)
|| <toolset>clang-darwin in $(properties)
{
result += <cxxflags>-fvisibility=hidden ;
}
if <boost>source in $(properties)
{
if <boost-link>static in $(properties) || <link>static in $(properties)
if <boost-link>static in $(properties)
{
result += <library>/boost/python//boost_python/<link>static ;
result += <library>/torrent//torrent/<link>static ;
}
else
{
result += <library>/boost/python//boost_python/<link>shared ;
}
if <link>static in $(properties)
{
result += <library>/torrent//torrent/<link>static ;
}
else
{
result += <library>/torrent//torrent/<link>shared/<boost-link>shared ;
}
}