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

fix python binding build issue

This commit is contained in:
arvidn 2015-06-06 17:38:46 -04:00
parent 9957c00def
commit a3d397e194
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bindings/python/Jamfile
View File

@ -12,7 +12,7 @@ lib boost_python : : <name>boost_python ;
feature visibility : default hidden : composite propagated link-incompatible ; feature visibility : default hidden : composite propagated link-incompatible ;
feature.compose <visibility>hidden : <cflags>-fvisibility=hidden <cxxflags>-fvisibility-inlines-hidden ; feature.compose <visibility>hidden : <cflags>-fvisibility=hidden <cxxflags>-fvisibility-inlines-hidden ;
feature libtorrent-link : static shared : ; feature libtorrent-link : shared static : ;
feature libtorrent-python-pic : off on : composite propagated link-incompatible ; feature libtorrent-python-pic : off on : composite propagated link-incompatible ;
feature.compose <libtorrent-python-pic>on : <cflags>-fPIC ; feature.compose <libtorrent-python-pic>on : <cflags>-fPIC ;
@ -46,7 +46,6 @@ rule libtorrent_linking ( properties * )
if <boost>source in $(properties) if <boost>source in $(properties)
{ {
if <boost-link>static in $(properties) && <target-os>linux in $(properties) if <boost-link>static in $(properties) && <target-os>linux in $(properties)
{ {
ECHO "WARNING: you cannot link statically against boost-python on linux, because it links against pthread statically in that case, which is not allowed" ; ECHO "WARNING: you cannot link statically against boost-python on linux, because it links against pthread statically in that case, which is not allowed" ;
@ -137,7 +136,7 @@ my-python-extension libtorrent
<conditional>@libtorrent_linking <conditional>@libtorrent_linking
: # default build : # default build
<boost-link>static <boost-link>static
<libtorrent-link>static <libtorrent-link>shared
<suppress-import-lib>false <suppress-import-lib>false
; ;

2
bindings/python/src/create_torrent.cpp
View File

@ -107,7 +107,7 @@ namespace
char const* filestorage_name(file_storage const& fs) char const* filestorage_name(file_storage const& fs)
{ return fs.name().c_str(); } { return fs.name().c_str(); }
bool call_python_object2(boost::python::object const& obj, std::string& i) bool call_python_object2(boost::python::object& obj, std::string const& i)
{ {
return obj(i); return obj(i);
} }