From 5958585e3a6ebc60f48d28cdea60d6913fa13ef8 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Mon, 20 Mar 2017 17:06:12 +0800 Subject: [PATCH 1/2] Add NTDDI_VERSION define --- cmake/Modules/winconf.cmake | 3 ++- winconf.pri | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/Modules/winconf.cmake b/cmake/Modules/winconf.cmake index e239ce07e..81ddf2867 100644 --- a/cmake/Modules/winconf.cmake +++ b/cmake/Modules/winconf.cmake @@ -3,7 +3,7 @@ # We want to link with static version of # libtorrent set(LibtorrentRasterbar_USE_STATIC_LIBS True) -set(LibtorrentRasterbar_CUSTOM_DEFINITIONS +set(LibtorrentRasterbar_CUSTOM_DEFINITIONS -DBOOST_ALL_NO_LIB -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 -DBOOST_ASIO_SEPARATE_COMPILATION -DBOOST_EXCEPTION_DISABLE @@ -17,6 +17,7 @@ add_definitions(-DUNICODE -DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN + -DNTDDI_VERSION=0x0501 -D_WIN32_WINNT=0x0501 -D_WIN32_IE=0x0500 -D_CRT_SECURE_NO_DEPRECATE diff --git a/winconf.pri b/winconf.pri index 63d12f33b..d27a11bb4 100644 --- a/winconf.pri +++ b/winconf.pri @@ -37,6 +37,7 @@ DEFINES += _UNICODE DEFINES += WIN32 DEFINES += _WIN32 DEFINES += WIN32_LEAN_AND_MEAN +DEFINES += NTDDI_VERSION=0x0501 DEFINES += _WIN32_WINNT=0x0501 DEFINES += _WIN32_IE=0x0501 DEFINES += _CRT_SECURE_NO_DEPRECATE From b77933016363c1a322a48d514c53fccab543a2fb Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sun, 26 Mar 2017 15:28:26 +0800 Subject: [PATCH 2/2] code formatting --- winconf.pri | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/winconf.pri b/winconf.pri index d27a11bb4..77e43091c 100644 --- a/winconf.pri +++ b/winconf.pri @@ -18,7 +18,7 @@ LIBS += $$quote(-LC:/qBittorrent/Zlib/lib) # Point this to the openssl lib folder LIBS += $$quote(-LC:/qBittorrent/openssl/lib) -# LIBTORRENT DEFINES +# BOOST DEFINES DEFINES += BOOST_ALL_NO_LIB DEFINES += BOOST_ASIO_HASH_MAP_BUCKETS=1021 DEFINES += BOOST_ASIO_SEPARATE_COMPILATION @@ -29,9 +29,13 @@ DEFINES += BOOST_ASIO_DISABLE_CONNECTEX DEFINES += BOOST_USE_WINAPI_VERSION=0x0501 DEFINES += BOOST_EXCEPTION_DISABLE DEFINES += BOOST_SYSTEM_STATIC_LINK=1 + +# LIBTORRENT DEFINES DEFINES += TORRENT_USE_OPENSSL DEFINES += TORRENT_DISABLE_GEO_IP DEFINES += TORRENT_DISABLE_RESOLVE_COUNTRIES + +# QBT DEFINES DEFINES += UNICODE DEFINES += _UNICODE DEFINES += WIN32