forked from premiere/premiere-libtorrent
completely drop BOOST_MULTI_INDEX_DISABLE_SERIALIZATION define from all build
systems as multi_index is no more used in src/file_pool.cpp.
This commit is contained in:
parent
a8e476613a
commit
f283065cfc
|
@ -214,7 +214,6 @@ if (MSVC)
|
||||||
endif(MSVC)
|
endif(MSVC)
|
||||||
|
|
||||||
add_definitions(-D_FILE_OFFSET_BITS=64)
|
add_definitions(-D_FILE_OFFSET_BITS=64)
|
||||||
add_definitions(-DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION)
|
|
||||||
add_definitions(-DBOOST_DISABLE_EXCEPTION)
|
add_definitions(-DBOOST_DISABLE_EXCEPTION)
|
||||||
|
|
||||||
if (tcmalloc)
|
if (tcmalloc)
|
||||||
|
|
1
Jamfile
1
Jamfile
|
@ -430,7 +430,6 @@ local usage-requirements =
|
||||||
<variant>release:<define>NDEBUG
|
<variant>release:<define>NDEBUG
|
||||||
<variant>debug:<define>TORRENT_DEBUG
|
<variant>debug:<define>TORRENT_DEBUG
|
||||||
<define>_FILE_OFFSET_BITS=64
|
<define>_FILE_OFFSET_BITS=64
|
||||||
<define>BOOST_MULTI_INDEX_DISABLE_SERIALIZATION
|
|
||||||
<define>BOOST_EXCEPTION_DISABLE
|
<define>BOOST_EXCEPTION_DISABLE
|
||||||
<conditional>@linking
|
<conditional>@linking
|
||||||
<zlib>system:<library>zlib-target
|
<zlib>system:<library>zlib-target
|
||||||
|
|
|
@ -79,6 +79,6 @@ setup( name='python-libtorrent',
|
||||||
include_dirs = ['@top_srcdir@/include','@top_srcdir@/include/libtorrent'] + parse_cmd(extra_cmd, '-I'),
|
include_dirs = ['@top_srcdir@/include','@top_srcdir@/include/libtorrent'] + parse_cmd(extra_cmd, '-I'),
|
||||||
library_dirs = ['@top_builddir@/src/.libs'] + parse_cmd(extra_cmd, '-L'),
|
library_dirs = ['@top_builddir@/src/.libs'] + 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() + ['-DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION'],
|
extra_compile_args = parse_cmd(extra_cmd, '-D', True) + arch(),
|
||||||
libraries = ['torrent-rasterbar','@BOOST_PYTHON_LIB@'] + parse_cmd(extra_cmd, '-l'))],
|
libraries = ['torrent-rasterbar','@BOOST_PYTHON_LIB@'] + parse_cmd(extra_cmd, '-l'))],
|
||||||
)
|
)
|
||||||
|
|
|
@ -20,6 +20,6 @@ simple_client_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la
|
||||||
enum_if_SOURCES = enum_if.cpp
|
enum_if_SOURCES = enum_if.cpp
|
||||||
enum_if_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la
|
enum_if_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la
|
||||||
|
|
||||||
AM_CXXFLAGS=-ftemplate-depth-50 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @DEBUGFLAGS@ @PTHREAD_CFLAGS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION
|
AM_CXXFLAGS=-ftemplate-depth-50 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @DEBUGFLAGS@ @PTHREAD_CFLAGS@
|
||||||
|
|
||||||
AM_LDFLAGS= ${LDLAGS} -L./ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION @SSL_LDFLAGS@ @SSL_LIBS@
|
AM_LDFLAGS= ${LDLAGS} -L./ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LDFLAGS@ @SSL_LIBS@
|
||||||
|
|
|
@ -38,6 +38,6 @@ test_transfer_SOURCES = test_transfer.cpp
|
||||||
|
|
||||||
LDADD = $(top_builddir)/src/libtorrent-rasterbar.la libtest.la
|
LDADD = $(top_builddir)/src/libtorrent-rasterbar.la libtest.la
|
||||||
|
|
||||||
AM_CXXFLAGS=-ftemplate-depth-50 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @DEBUGFLAGS@ @PTHREAD_CFLAGS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION
|
AM_CXXFLAGS=-ftemplate-depth-50 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @DEBUGFLAGS@ @PTHREAD_CFLAGS@
|
||||||
AM_LDFLAGS= @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LDFLAGS@ @SSL_LIBS@
|
AM_LDFLAGS= @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LDFLAGS@ @SSL_LIBS@
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue