mirror of
https://git.deluge-torrent.org/deluge
synced 2025-08-22 10:09:14 +00:00
Touch-up setup.py.
This commit is contained in:
parent
34fd115051
commit
684c3098d9
1 changed files with 13 additions and 16 deletions
25
setup.py
25
setup.py
|
@ -76,7 +76,6 @@ except:
|
||||||
|
|
||||||
# The libtorrent extension
|
# The libtorrent extension
|
||||||
_extra_compile_args = [
|
_extra_compile_args = [
|
||||||
"-Wno-missing-braces",
|
|
||||||
"-DHAVE_INCLUDE_LIBTORRENT_ASIO____ASIO_HPP=1",
|
"-DHAVE_INCLUDE_LIBTORRENT_ASIO____ASIO_HPP=1",
|
||||||
"-DHAVE_INCLUDE_LIBTORRENT_ASIO_SSL_STREAM_HPP=1",
|
"-DHAVE_INCLUDE_LIBTORRENT_ASIO_SSL_STREAM_HPP=1",
|
||||||
"-DHAVE_INCLUDE_LIBTORRENT_ASIO_IP_TCP_HPP=1",
|
"-DHAVE_INCLUDE_LIBTORRENT_ASIO_IP_TCP_HPP=1",
|
||||||
|
@ -86,9 +85,9 @@ _extra_compile_args = [
|
||||||
"-O2",
|
"-O2",
|
||||||
"-DNDEBUG"
|
"-DNDEBUG"
|
||||||
]
|
]
|
||||||
|
|
||||||
if windows_check():
|
if windows_check():
|
||||||
_extra_compile_args.remove("-Wno-missing-braces")
|
_extra_compile_args += [
|
||||||
_extra_compile_args = _extra_compile_args + [
|
|
||||||
"-DBOOST_WINDOWS",
|
"-DBOOST_WINDOWS",
|
||||||
"-DWIN32_LEAN_AND_MEAN",
|
"-DWIN32_LEAN_AND_MEAN",
|
||||||
"-D_WIN32_WINNT=0x0500",
|
"-D_WIN32_WINNT=0x0500",
|
||||||
|
@ -102,6 +101,8 @@ if windows_check():
|
||||||
"-DTORRENT_BUILDING_SHARED",
|
"-DTORRENT_BUILDING_SHARED",
|
||||||
"-DTORRENT_LINKING_SHARED",
|
"-DTORRENT_LINKING_SHARED",
|
||||||
]
|
]
|
||||||
|
else:
|
||||||
|
_extra_compile_args += ["-Wno-missing-braces"]
|
||||||
|
|
||||||
removals = ["-Wstrict-prototypes"]
|
removals = ["-Wstrict-prototypes"]
|
||||||
|
|
||||||
|
@ -119,11 +120,11 @@ if not windows_check():
|
||||||
|
|
||||||
_extra_link_args = [
|
_extra_link_args = [
|
||||||
]
|
]
|
||||||
|
|
||||||
_include_dirs = [
|
_include_dirs = [
|
||||||
'./libtorrent',
|
'./libtorrent',
|
||||||
'./libtorrent/include',
|
'./libtorrent/include',
|
||||||
'./libtorrent/include/libtorrent',
|
'./libtorrent/include/libtorrent',
|
||||||
'/usr/include/python' + python_version
|
|
||||||
]
|
]
|
||||||
|
|
||||||
_libraries = [
|
_libraries = [
|
||||||
|
@ -133,19 +134,12 @@ _libraries = [
|
||||||
'boost_python',
|
'boost_python',
|
||||||
'z',
|
'z',
|
||||||
'pthread',
|
'pthread',
|
||||||
'ssl',
|
|
||||||
]
|
]
|
||||||
|
|
||||||
if windows_check():
|
if windows_check():
|
||||||
_extra_link_args = _extra_link_args + [
|
_extra_link_args += ['-L./win32/lib']
|
||||||
'-L./win32/lib'
|
_include_dirs += ['./win32/include']
|
||||||
]
|
_libraries += [
|
||||||
_include_dirs.remove('/usr/include/python' + python_version)
|
|
||||||
_include_dirs = _include_dirs + [
|
|
||||||
'./win32/include'
|
|
||||||
]
|
|
||||||
_libraries.remove('ssl')
|
|
||||||
_libraries = _libraries + [
|
|
||||||
'ssleay32MT',
|
'ssleay32MT',
|
||||||
'libeay32MT',
|
'libeay32MT',
|
||||||
'advapi32',
|
'advapi32',
|
||||||
|
@ -153,6 +147,9 @@ if windows_check():
|
||||||
'gdi32',
|
'gdi32',
|
||||||
'ws2_32'
|
'ws2_32'
|
||||||
]
|
]
|
||||||
|
else:
|
||||||
|
_include_dirs += ['/usr/include/python' + python_version]
|
||||||
|
_libraries += ['ssl']
|
||||||
|
|
||||||
_sources = glob.glob("./libtorrent/src/*.cpp") + \
|
_sources = glob.glob("./libtorrent/src/*.cpp") + \
|
||||||
glob.glob("./libtorrent/src/kademlia/*.cpp") + \
|
glob.glob("./libtorrent/src/kademlia/*.cpp") + \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue