github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-05 20:51:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Update libtorrent build defines on Windows

Browse source 
`TORRENT_USE_LIBCRYPTO` replaced `TORRENT_USE_OPENSSL` since OpenSSL 1.1.
`TORRENT_DISABLE_RESOLVE_COUNTRIES` has been removed since libtorrent 1.2.
This commit is contained in:
Chocobo1 2019-10-09 02:52:46 +08:00
parent c7f092b95f
commit ccbd9c83e2
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmake/Modules/FindLibtorrentRasterbar.cmake
View file

@ -38,6 +38,8 @@ else()
# libtorrent is very picky about those. Let's take a set of defaults and # libtorrent is very picky about those. Let's take a set of defaults and
# hope that they apply. If not, you the user are on your own. # hope that they apply. If not, you the user are on your own.
set(LibtorrentRasterbar_DEFINITIONS set(LibtorrentRasterbar_DEFINITIONS
-DTORRENT_USE_LIBCRYPTO
# TODO: remove the following define as it is not used since OpenSSL >= 1.1
-DTORRENT_USE_OPENSSL -DTORRENT_USE_OPENSSL
-DBOOST_ASIO_ENABLE_CANCELIO -DBOOST_ASIO_ENABLE_CANCELIO
-DUNICODE -D_UNICODE -D_FILE_OFFSET_BITS=64) -DUNICODE -D_UNICODE -D_FILE_OFFSET_BITS=64)

6
cmake/Modules/winconf.cmake
View file

@ -5,8 +5,12 @@ list(APPEND CMAKE_LIBRARY_PATH "$ENV{LIB}")
set(LibtorrentRasterbar_CUSTOM_DEFINITIONS set(LibtorrentRasterbar_CUSTOM_DEFINITIONS
-DBOOST_ASIO_DISABLE_CONNECTEX -DBOOST_ASIO_DISABLE_CONNECTEX
-DBOOST_EXCEPTION_DISABLE -DBOOST_EXCEPTION_DISABLE
-DTORRENT_USE_LIBCRYPTO
# TODO: remove the following define as it is not used since OpenSSL >= 1.1
-DTORRENT_USE_OPENSSL -DTORRENT_USE_OPENSSL
-DTORRENT_DISABLE_RESOLVE_COUNTRIES) # TODO: remove the following define as it is not used since libtorrent >= 1.2
-DTORRENT_DISABLE_RESOLVE_COUNTRIES
)
set(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES system) set(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES system)

3
winconf.pri
View file

@ -3,7 +3,10 @@
DEFINES += BOOST_ASIO_DISABLE_CONNECTEX DEFINES += BOOST_ASIO_DISABLE_CONNECTEX
DEFINES += BOOST_EXCEPTION_DISABLE DEFINES += BOOST_EXCEPTION_DISABLE
DEFINES += TORRENT_USE_LIBCRYPTO
# TODO: remove the following define as it is not used since OpenSSL >= 1.1
DEFINES += TORRENT_USE_OPENSSL DEFINES += TORRENT_USE_OPENSSL
# TODO: remove the following define as it is not used since libtorrent >= 1.2
DEFINES += TORRENT_DISABLE_RESOLVE_COUNTRIES DEFINES += TORRENT_DISABLE_RESOLVE_COUNTRIES
DEFINES += NTDDI_VERSION=0x06010000 DEFINES += NTDDI_VERSION=0x06010000