forked from premiere/premiere-libtorrent
merged changes from RC_1_0
This commit is contained in:
parent
12e61fe8ea
commit
7bc35c1e63
|
@ -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
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
@LDFLAGS@
|
@LDFLAGS@ -L@top_builddir@/src/.libs
|
||||||
|
|
|
@ -96,8 +96,8 @@ else:
|
||||||
ext = [Extension('libtorrent',
|
ext = [Extension('libtorrent',
|
||||||
sources = source_list,
|
sources = source_list,
|
||||||
language='c++',
|
language='c++',
|
||||||
include_dirs = ['../../../include'] + parse_cmd(extra_cmd, '-I'),
|
include_dirs = parse_cmd(extra_cmd, '-I'),
|
||||||
library_dirs = ['../../src/.libs'] + parse_cmd(extra_cmd, '-L'),
|
library_dirs = parse_cmd(extra_cmd, '-L'),
|
||||||
extra_link_args = ldflags.split() + arch(),
|
extra_link_args = ldflags.split() + arch(),
|
||||||
extra_compile_args = parse_cmd(extra_cmd, '-D', True) + arch() \
|
extra_compile_args = parse_cmd(extra_cmd, '-D', True) + arch() \
|
||||||
+ target_specific(),
|
+ target_specific(),
|
||||||
|
|
Loading…
Reference in New Issue