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

merged fixes from RC_1_0

This commit is contained in:
Arvid Norberg 2014-11-27 03:05:06 +00:00
parent f73fe335e2
commit 1c91903c9c
5 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -255,8 +255,10 @@ endif()
if (WIN32) if (WIN32)
target_link_libraries(torrent-rasterbar wsock32 ws2_32) target_link_libraries(torrent-rasterbar wsock32 ws2_32)
add_definitions(-D_WIN32_WINNT=0x0500) add_definitions(-D_WIN32_WINNT=0x0600)
if (MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") # multicore compilation set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") # multicore compilation
endif()
endif() endif()
if (encryption) if (encryption)

4
Makefile.am
View File

@ -121,10 +121,6 @@ EXTRA_DIST = \
Jamroot.jam \ Jamroot.jam \
CMakeLists.txt \ CMakeLists.txt \
LICENSE \ LICENSE \
bindings/python/compile_flags \
bindings/python/link_flags \
libtorrent-rasterbar.pc \
libtorrent-rasterbar-cmake.pc \
$(DOCS_PAGES) \ $(DOCS_PAGES) \
$(DOCS_IMAGES) \ $(DOCS_IMAGES) \
$(ED25519_SOURCE) $(ED25519_SOURCE)

1
bindings/python/Makefile.am
View File

@ -7,6 +7,7 @@ EXTRA_DIST = \
simple_client.py \ simple_client.py \
make_torrent.py \ make_torrent.py \
src/alert.cpp \ src/alert.cpp \
src/bytes.hpp \
src/big_number.cpp \ src/big_number.cpp \
src/converters.cpp \ src/converters.cpp \
src/create_torrent.cpp \ src/create_torrent.cpp \

4
bindings/python/setup.py
View File

@ -68,10 +68,10 @@ if '--bjam' in sys.argv or ldflags == None or extra_cmd == None:
toolset = ' msvc-9.0' toolset = ' msvc-9.0'
file_ext = '.pyd' file_ext = '.pyd'
parallell_builds = ' -j%d' % multiprocessing.cpu_count() parallel_builds = ' -j%d' % multiprocessing.cpu_count()
# build libtorrent using bjam and build the installer with distutils # build libtorrent using bjam and build the installer with distutils
cmdline = 'bjam boost=source link=static boost-link=static release optimization=space stage_module --abbreviate-paths' + toolset + parallell_builds cmdline = 'bjam boost=source link=static boost-link=static release optimization=space stage_module --abbreviate-paths' + toolset + parallel_builds
print(cmdline) print(cmdline)
if os.system(cmdline) != 0: if os.system(cmdline) != 0:
print('build failed') print('build failed')

5
src/broadcast_socket.cpp
View File

@ -260,11 +260,8 @@ namespace libtorrent
ec = error_code(); ec = error_code();
// if_nametoindex was introduced in vista // if_nametoindex was introduced in vista
// and apparently msvc-9.0 doesn't support this, even though
// the _WIN32_WINNT version indicates vista+
#if TORRENT_USE_IPV6 \ #if TORRENT_USE_IPV6 \
&& (!defined TORRENT_WINDOWS \ && (!defined TORRENT_WINDOWS || _WIN32_WINNT >= 0x0600) \
|| (_WIN32_WINNT >= _WIN32_WINNT_VISTA && _MSC_VER > 1500)) \
&& !defined TORRENT_MINGW && !defined TORRENT_MINGW
if (i->interface_address.is_v6() && if (i->interface_address.is_v6() &&