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

python binding fixes

This commit is contained in:
Arvid Norberg 2015-04-04 19:24:26 +00:00
parent fa450084bd
commit 967379e324
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bindings/python/Jamfile
View File

@ -47,10 +47,10 @@ rule libtorrent_linking ( properties * )
if <boost>source in $(properties) if <boost>source in $(properties)
{ {
if <boost-link>static in $(properties) && <target-os>linux 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" ;
} }
# linux must link dynamically against boost python because it pulls # linux must link dynamically against boost python because it pulls
# in libpthread, which must be linked dynamically since we're building a .so # in libpthread, which must be linked dynamically since we're building a .so

3
bindings/python/src/alert.cpp
View File

@ -182,6 +182,9 @@ void bind_alert()
.value("ip_block_notification", alert::ip_block_notification) .value("ip_block_notification", alert::ip_block_notification)
.value("performance_warning", alert::performance_warning) .value("performance_warning", alert::performance_warning)
.value("stats_notification", alert::stats_notification) .value("stats_notification", alert::stats_notification)
.value("session_log_notification", alert::session_log_notification)
.value("torrent_log_notification", alert::torrent_log_notification)
.value("peer_log_notification", alert::peer_log_notification)
// deliberately not INT_MAX. Arch linux crash while throwing an exception // deliberately not INT_MAX. Arch linux crash while throwing an exception
.value("all_categories", (alert::category_t)0xfffffff) .value("all_categories", (alert::category_t)0xfffffff)
; ;

2
include/libtorrent/alert.hpp
View File

@ -166,10 +166,12 @@ namespace libtorrent {
// the lasts stats alert. // the lasts stats alert.
stats_notification = 0x800, stats_notification = 0x800,
#ifndef TORRENT_NO_DEPRECATE
// Alerts on RSS related events, like feeds being updated, feed error // Alerts on RSS related events, like feeds being updated, feed error
// conditions and successful RSS feed updates. Enabling this categoty // conditions and successful RSS feed updates. Enabling this categoty
// will make you receive rss_alert alerts. // will make you receive rss_alert alerts.
rss_notification = 0x1000, rss_notification = 0x1000,
#endif
// Enables debug logging alerts. These are only available when // Enables debug logging alerts. These are only available when
// libtorrent is built with logging enabled (``TORRENT_LOGGING``). // libtorrent is built with logging enabled (``TORRENT_LOGGING``).