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

merged changes from RC_1_0

This commit is contained in:
Arvid Norberg 2014-12-02 10:18:07 +00:00
parent 4376d26399
commit 066cbf1a9f
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bindings/python/Jamfile
View File

@ -20,7 +20,8 @@ rule libtorrent_linking ( properties * )
{
local result ;
if <target-os>linux && <toolset>gcc in $(properties)
if ! <target-os>windows in $(properties)
&& <toolset>gcc in $(properties)
{
result += <libtorrent-python-pic>on ;
}
@ -40,9 +41,9 @@ rule libtorrent_linking ( properties * )
if <boost>source in $(properties)
{
# linux must link dynamically against boost python because it pulls
# in libpthread, which must be linked dynamically since we're building a .so
# (the static build of libpthread is not position independent)
# linux must link dynamically against boost python because it pulls
# in libpthread, which must be linked dynamically since we're building a .so
# (the static build of libpthread is not position independent)
if <boost-link>shared in $(properties) || <target-os>linux in $(properties)
{
result += <library>/boost/python//boost_python/<link>shared ;

14
src/asio_ssl.cpp
View File

@ -2,6 +2,20 @@
#include <boost/version.hpp>
#include <climits>
#ifndef BOOST_ASIO_SOURCE
#define BOOST_ASIO_SOURCE
#endif
#include "libtorrent/config.hpp"
#define TORRENT_HAS_ASIO_DECL x ## BOOST_ASIO_DECL
// only define BOOST_ASIO_DECL if it hasn't already been defined
// or if it has been defined to an empty string
#if TORRENT_HAS_ASIO_DECL == x
#define BOOST_ASIO_DECL BOOST_SYMBOL_EXPORT
#endif
#if BOOST_VERSION >= 104610
#include <boost/asio/ssl/impl/src.hpp>
#endif