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

fixed windows ssl shared library build

This commit is contained in:
Arvid Norberg 2012-07-23 16:10:34 +00:00
parent bcb22239bf
commit 8ded061c9e
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Jamfile
View File

@ -173,13 +173,27 @@ rule linking ( properties * )
else else
{ {
result += <library>/boost/system//boost_system/<link>shared ; result += <library>/boost/system//boost_system/<link>shared ;
# when building a shared library with openssl, for some reason we really need
# boost date time (at least on windows). Hopefully a future version of asio
# will allow disabling this dependency
if <encryption>openssl in $(properties)
{
result += <library>/boost/date_time//boost_date_time/<link>shared ;
}
} }
result += <include>$(BOOST_ROOT) <define>BOOST_ALL_NO_LIB ; result += <include>$(BOOST_ROOT) <define>BOOST_ALL_NO_LIB ;
} }
else else
{ {
result += <library>boost_system ; result += <library>boost_system ;
if <boost-link>shared in $(properties) && <encryption>openssl in $(properties)
{
result += <library>boost_date_time ;
}
# 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
@ -411,11 +425,13 @@ local boost-library-search-path =
; ;
lib boost_system : : <target-os>darwin <name>boost_system-mt $(boost-library-search-path) ; lib boost_system : : <target-os>darwin <name>boost_system-mt $(boost-library-search-path) ;
lib boost_system : : <target-os>solaris <name>boost_system $(boost-library-search-path) ; lib boost_system : : <target-os>solaris <name>boost_system $(boost-library-search-path) ;
lib boost_system : : <name>boost_system ; lib boost_system : : <name>boost_system ;
lib boost_date_time : : <target-os>darwin <name>boost_date_time-mt $(boost-library-search-path) ;
lib boost_date_time : : <target-os>solaris <name>boost_date_time $(boost-library-search-path) ;
lib boost_date_time : : <name>boost_date_time ;
# openssl on linux/bsd/macos etc. # openssl on linux/bsd/macos etc.
lib gcrypt : : <name>gcrypt <link>shared <search>/opt/local/lib ; lib gcrypt : : <name>gcrypt <link>shared <search>/opt/local/lib ;
lib z : : <link>shared <name>z <search>/lib ; lib z : : <link>shared <name>z <search>/lib ;

4
src/asio.cpp
View File

@ -51,7 +51,9 @@
#include <boost/asio/detail/impl/strand_service.ipp> #include <boost/asio/detail/impl/strand_service.ipp>
#include <boost/asio/detail/impl/task_io_service.ipp> #include <boost/asio/detail/impl/task_io_service.ipp>
#include <boost/asio/detail/impl/throw_error.ipp> #include <boost/asio/detail/impl/throw_error.ipp>
//#include <boost/asio/detail/impl/timer_queue.ipp> #if defined TORRENT_USE_OPENSSL
#include <boost/asio/detail/impl/timer_queue_ptime.ipp>
#endif
#include <boost/asio/detail/impl/timer_queue_set.ipp> #include <boost/asio/detail/impl/timer_queue_set.ipp>
#include <boost/asio/detail/impl/win_iocp_handle_service.ipp> #include <boost/asio/detail/impl/win_iocp_handle_service.ipp>
#include <boost/asio/detail/impl/win_iocp_io_service.ipp> #include <boost/asio/detail/impl/win_iocp_io_service.ipp>