From 7bc35c1e631d22ca0fc6fb1571b096dce2ff0793 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Wed, 27 Aug 2014 06:18:02 +0000 Subject: [PATCH] merged changes from RC_1_0 --- bindings/python/compile_flags.in | 2 +- bindings/python/link_flags.in | 2 +- bindings/python/setup.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bindings/python/compile_flags.in b/bindings/python/compile_flags.in index 14fce1abb..6e23cdbd4 100644 --- a/bindings/python/compile_flags.in +++ b/bindings/python/compile_flags.in @@ -1 +1 @@ -@COMPILETIME_OPTIONS@ @CPPFLAGS@ @LIBS@ @BOOST_SYSTEM_LIB@ @BOOST_PYTHON_LIB@ @PTHREAD_LIBS@ @OPENSSL_LIBS@ @OPENSSL_LDFLAGS@ @OPENSSL_INCLUDES@ +@COMPILETIME_OPTIONS@ @CPPFLAGS@ @LIBS@ @BOOST_SYSTEM_LIB@ @BOOST_PYTHON_LIB@ @PTHREAD_LIBS@ @OPENSSL_LIBS@ @OPENSSL_LDFLAGS@ @OPENSSL_INCLUDES@ -I@top_srcdir@/include diff --git a/bindings/python/link_flags.in b/bindings/python/link_flags.in index 3c1da5b14..0ffdde79c 100644 --- a/bindings/python/link_flags.in +++ b/bindings/python/link_flags.in @@ -1 +1 @@ -@LDFLAGS@ +@LDFLAGS@ -L@top_builddir@/src/.libs diff --git a/bindings/python/setup.py b/bindings/python/setup.py index afd483160..ede5bda63 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -96,8 +96,8 @@ else: ext = [Extension('libtorrent', sources = source_list, language='c++', - include_dirs = ['../../../include'] + parse_cmd(extra_cmd, '-I'), - library_dirs = ['../../src/.libs'] + parse_cmd(extra_cmd, '-L'), + include_dirs = parse_cmd(extra_cmd, '-I'), + library_dirs = parse_cmd(extra_cmd, '-L'), extra_link_args = ldflags.split() + arch(), extra_compile_args = parse_cmd(extra_cmd, '-D', True) + arch() \ + target_specific(),