wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

some more shared linking fixes

This commit is contained in:
Arvid Norberg 2012-03-15 17:17:10 +00:00
parent 64b599598c
commit 750801d25b
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Jamfile
View File

@ -37,6 +37,10 @@ rule linking ( properties * )
# and imported # and imported
result += <define>BOOST_ASIO_DYN_LINK ; result += <define>BOOST_ASIO_DYN_LINK ;
} }
else
{
result += <define>BOOST_ASIO_SEPARATE_COMPILATION ;
}
# openssl libraries, if enabled # openssl libraries, if enabled
if <encryption>openssl in $(properties) if <encryption>openssl in $(properties)
@ -142,11 +146,6 @@ rule linking ( properties * )
result += <library>tcmalloc ; result += <library>tcmalloc ;
} }
if <boost>system in $(properties)
{
result += <library>boost_system ;
}
if <toolset>gcc in $(properties) if <toolset>gcc in $(properties)
&& <target-os>linux in $(properties) && <target-os>linux in $(properties)
&& (<variant>debug in $(properties) && (<variant>debug in $(properties)
@ -169,6 +168,11 @@ rule linking ( properties * )
# need to make boost think it's being built as a shared # need to make boost think it's being built as a shared
# library, so that it properly exports its symbols # library, so that it properly exports its symbols
result += <define>BOOST_ALL_DYN_LINK ; result += <define>BOOST_ALL_DYN_LINK ;
result += <library>/boost/system//boost_system/<link>static/<define>BOOST_ALL_DYN_LINK ;
}
else
{
result += <library>/boost/system//boost_system/<link>static ;
} }
if <toolset>gcc in $(properties) && <link>shared in $(properties) if <toolset>gcc in $(properties) && <link>shared in $(properties)
@ -176,7 +180,6 @@ rule linking ( properties * )
result += <fpic>on ; result += <fpic>on ;
} }
result += <library>/boost/system//boost_system/<link>static ;
} }
else else
{ {
@ -184,9 +187,10 @@ rule linking ( properties * )
} }
result += <include>$(BOOST_ROOT) <define>BOOST_ALL_NO_LIB ; result += <include>$(BOOST_ROOT) <define>BOOST_ALL_NO_LIB ;
} }
else
if <boost>system in $(properties)
{ {
result += <library>boost_system ;
# 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
# on open indiana, boost is install at /usr/g++/include # on open indiana, boost is install at /usr/g++/include

2
test/Jamfile
View File

@ -9,7 +9,7 @@ explicit test_natpmp ;
project project
: requirements : requirements
<library>/torrent//torrent/<link>shared <library>/torrent//torrent/<link>shared/<boost-link>shared
<source>main.cpp <source>main.cpp
<source>setup_transfer.cpp <source>setup_transfer.cpp
: default-build : default-build