set more windows-specific paths
This commit is contained in:
parent
7b92e05326
commit
b35b08d9f7
12
setup.py
12
setup.py
|
@ -100,6 +100,9 @@ if ARCH == "x64":
|
||||||
|
|
||||||
if not OS == "win":
|
if not OS == "win":
|
||||||
EXTRA_COMPILE_ARGS = ["-Wno-missing-braces"]
|
EXTRA_COMPILE_ARGS = ["-Wno-missing-braces"]
|
||||||
|
includedirs = ['./libtorrent', './libtorrent/include',
|
||||||
|
'./libtorrent/include/libtorrent',
|
||||||
|
'/usr/include/python' + python_version]
|
||||||
|
|
||||||
if OS == "linux":
|
if OS == "linux":
|
||||||
if os.WEXITSTATUS(os.system('grep -iq "Debian GNU/Linux 4.0\|Ubuntu 7.04\|Ubuntu 6.06\|Ubuntu 6.10\|Fedora Core release 6\|openSUSE 10.2\|Mandriva Linux release 2007.1\|Fedora release 7" /etc/issue')) == 0:
|
if os.WEXITSTATUS(os.system('grep -iq "Debian GNU/Linux 4.0\|Ubuntu 7.04\|Ubuntu 6.06\|Ubuntu 6.10\|Fedora Core release 6\|openSUSE 10.2\|Mandriva Linux release 2007.1\|Fedora release 7" /etc/issue')) == 0:
|
||||||
|
@ -129,7 +132,10 @@ if not OS == "win":
|
||||||
sysconfig.get_config_vars()["OPT"] = ' '.join(cv_opt.split())
|
sysconfig.get_config_vars()["OPT"] = ' '.join(cv_opt.split())
|
||||||
else:
|
else:
|
||||||
boosttype = 'mt'
|
boosttype = 'mt'
|
||||||
EXTRA_COMPILE_FLAGS = '/link /LIBPATH: C:\Program Files\boost\boost_1_34_0\lib'
|
EXTRA_COMPILE_FLAGS = '/link /LIBPATH: C:\Program Files\boost\boost_1_34_0\lib /LIBPATH: c:\win32-build-deps\lib'
|
||||||
|
includedirs = ['./libtorrent', './libtorrent/include',
|
||||||
|
'./libtorrent/include/libtorrent',
|
||||||
|
'c:\Python25\include']
|
||||||
|
|
||||||
# NOTE: The Rasterbar Libtorrent source code is in the libtorrent/ directory
|
# NOTE: The Rasterbar Libtorrent source code is in the libtorrent/ directory
|
||||||
# inside of Deluge's source tarball. On several occasions, it has been
|
# inside of Deluge's source tarball. On several occasions, it has been
|
||||||
|
@ -151,9 +157,7 @@ elif boosttype == "mt":
|
||||||
print 'Libraries mt'
|
print 'Libraries mt'
|
||||||
|
|
||||||
deluge_core = Extension('_deluge_core',
|
deluge_core = Extension('_deluge_core',
|
||||||
include_dirs = ['./libtorrent', './libtorrent/include',
|
include_dirs = includedirs,
|
||||||
'./libtorrent/include/libtorrent',
|
|
||||||
'/usr/include/python' + python_version],
|
|
||||||
libraries = librariestype,
|
libraries = librariestype,
|
||||||
extra_compile_args = EXTRA_COMPILE_ARGS,
|
extra_compile_args = EXTRA_COMPILE_ARGS,
|
||||||
sources = ['src/deluge_core.cpp',
|
sources = ['src/deluge_core.cpp',
|
||||||
|
|
Loading…
Reference in New Issue