jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build windows python bindings with geoip support. fixes some warnings in msvc

Browse Source
This commit is contained in:
Arvid Norberg
2009-04-26 21:21:31 +00:00
parent c7dd73dd08
commit 12dd8a8723
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bindings/python/setup.py.in
View File

@@ -30,7 +30,7 @@ def arch():
if platform.system() == 'Windows': if platform.system() == 'Windows':
# on windows, build using bjam and build an installer # on windows, build using bjam and build an installer
import shutil import shutil
if os.system('bjam boost=source link=static boost-link=static release msvc-7.1 optimization=space') != 0: if os.system('bjam boost=source link=static geoip=static boost-link=static release msvc-7.1 optimization=space') != 0:
print 'build failed' print 'build failed'
sys.exit(1) sys.exit(1)
try: os.mkdir(r'build') try: os.mkdir(r'build')
@@ -39,7 +39,7 @@ if platform.system() == 'Windows':
except: pass except: pass
try: os.mkdir(r'libtorrent') try: os.mkdir(r'libtorrent')
except: pass except: pass
shutil.copyfile(r'bin\msvc-7.1\release\boost-source\link-static\optimization-space\threading-multi\libtorrent.pyd', r'.\build\lib\libtorrent.pyd') shutil.copyfile(r'bin\msvc-7.1\release\boost-source\geoip-static\link-static\optimization-space\threading-multi\libtorrent.pyd', r'.\build\lib\libtorrent.pyd')
setup( name='python-libtorrent', setup( name='python-libtorrent',
version='@PACKAGE_VERSION@', version='@PACKAGE_VERSION@',
author = 'Arvid Norberg', author = 'Arvid Norberg',

4
include/libtorrent/bitfield.hpp
View File

@@ -70,7 +70,7 @@ namespace libtorrent
{ {
TORRENT_ASSERT(index >= 0); TORRENT_ASSERT(index >= 0);
TORRENT_ASSERT(index < m_size); TORRENT_ASSERT(index < m_size);
return m_bytes[index / 8] & (0x80 >> (index & 7)); return (m_bytes[index / 8] & (0x80 >> (index & 7))) != 0;
} }
void clear_bit(int index) void clear_bit(int index)
@@ -135,7 +135,7 @@ namespace libtorrent
typedef bool& reference; typedef bool& reference;
typedef std::forward_iterator_tag iterator_category; typedef std::forward_iterator_tag iterator_category;
bool operator*() { return *byte & bit; } bool operator*() { return (*byte & bit) != 0; }
const_iterator& operator++() { inc(); return *this; } const_iterator& operator++() { inc(); return *this; }
const_iterator operator++(int) const_iterator operator++(int)
{ const_iterator ret(*this); inc(); return ret; } { const_iterator ret(*this); inc(); return ret; }

2
include/libtorrent/config.hpp
View File

@@ -52,6 +52,8 @@ POSSIBILITY OF SUCH DAMAGE.
#elif defined(BOOST_MSVC) #elif defined(BOOST_MSVC)
#pragma warning(disable: 4258)
# if defined(TORRENT_BUILDING_SHARED) # if defined(TORRENT_BUILDING_SHARED)
# define TORRENT_EXPORT __declspec(dllexport) # define TORRENT_EXPORT __declspec(dllexport)
# elif defined(TORRENT_LINKING_SHARED) # elif defined(TORRENT_LINKING_SHARED)

2
include/libtorrent/piece_picker.hpp
View File

@@ -58,7 +58,7 @@ namespace libtorrent
class torrent; class torrent;
class peer_connection; class peer_connection;
class bitfield; struct bitfield;
struct TORRENT_EXPORT piece_block struct TORRENT_EXPORT piece_block
{ {