From e47d7fe55c9ba7fced3fda8f9360c5f7720387b3 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Fri, 21 Jun 2019 00:35:26 +0800 Subject: [PATCH] Remove outdated defines --- cmake/Modules/FindLibtorrentRasterbar.cmake | 1 - conf.pri.windows | 7 +------ winconf.pri | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/cmake/Modules/FindLibtorrentRasterbar.cmake b/cmake/Modules/FindLibtorrentRasterbar.cmake index 4e1f946b0..d3465e862 100644 --- a/cmake/Modules/FindLibtorrentRasterbar.cmake +++ b/cmake/Modules/FindLibtorrentRasterbar.cmake @@ -39,7 +39,6 @@ else() # hope that they apply. If not, you the user are on your own. set(LibtorrentRasterbar_DEFINITIONS -DTORRENT_USE_OPENSSL - -DTORRENT_DISABLE_GEO_IP -DBOOST_ASIO_ENABLE_CANCELIO -DUNICODE -D_UNICODE -D_FILE_OFFSET_BITS=64) endif() diff --git a/conf.pri.windows b/conf.pri.windows index dab9d8cc9..01367afa5 100644 --- a/conf.pri.windows +++ b/conf.pri.windows @@ -46,15 +46,10 @@ DEFINES += BOOST_SYSTEM_STATIC_LINK #DEFINES += BOOST_SYSTEM_DYN_LINK # Boost 1.60+ defaults to Vista+ support. The define below enables XP support again. DEFINES += BOOST_USE_WINAPI_VERSION=0x0501 -# Enable if building against libtorrent 1.0.x (RC_1_0) (static linking) -#DEFINES += BOOST_ASIO_SEPARATE_COMPILATION -# Enable if building against libtorrent 1.0.x (RC_1_0) (dynamic linking) -#DEFINES += BOOST_ASIO_DYN_LINK # Enable if encountered build error with boost version <= 1.59 #DEFINES += BOOST_NO_CXX11_RVALUE_REFERENCES -# Enable if building against libtorrent 1.1.x (RC_1_1) -# built with this flag defined +# Enable if libtorrent was built with this flag defined #DEFINES += TORRENT_NO_DEPRECATE # Enable if linking dynamically against libtorrent #DEFINES += TORRENT_LINKING_SHARED diff --git a/winconf.pri b/winconf.pri index 0c700380f..6db3ef61f 100644 --- a/winconf.pri +++ b/winconf.pri @@ -5,7 +5,6 @@ DEFINES += BOOST_ASIO_DISABLE_CONNECTEX DEFINES += BOOST_EXCEPTION_DISABLE DEFINES += TORRENT_USE_OPENSSL -DEFINES += TORRENT_DISABLE_GEO_IP DEFINES += TORRENT_DISABLE_RESOLVE_COUNTRIES DEFINES += UNICODE