d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #11016 from Chocobo1/vista 

Raise minimum support to Windows 7
adaptive-webui-19844
Mike Tzou 5 years ago committed by GitHub
parent
d8f0c245f4 2f0ae7a7d8
commit
ec4240dd06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      cmake/Modules/winconf.cmake
  2. 6
      conf.pri.windows
  3. 3
      winconf.pri

9
cmake/Modules/winconf.cmake
Unescape View File

@ -19,14 +19,15 @@ set(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES system)
#set(Boost_USE_STATIC_LIBS True) #set(Boost_USE_STATIC_LIBS True)
#set(Boost_USE_STATIC_RUNTIME True) #set(Boost_USE_STATIC_RUNTIME True)
add_definitions(-DUNICODE add_definitions(
-DNTDDI_VERSION=0x06010000
-D_WIN32_WINNT=0x0601
-D_WIN32_IE=0x0601
-DUNICODE
-D_UNICODE -D_UNICODE
-DWIN32 -DWIN32
-D_WIN32 -D_WIN32
-DWIN32_LEAN_AND_MEAN -DWIN32_LEAN_AND_MEAN
-DNTDDI_VERSION=0x05010000
-D_WIN32_WINNT=0x0501
-D_WIN32_IE=0x0501
-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_DEPRECATE
-D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE
-DNOMINMAX -DNOMINMAX

6
conf.pri.windows
Unescape View File

@ -35,17 +35,11 @@ LIBS += zlib.lib
#LIBS += libcrypto libssl #LIBS += libcrypto libssl
#LIBS += libz #LIBS += libz
DEFINES += NTDDI_VERSION=0x05010000
DEFINES += _WIN32_WINNT=0x0501
DEFINES += _WIN32_IE=0x0501
# Disable to use Boost auto-linking # Disable to use Boost auto-linking
DEFINES += BOOST_ALL_NO_LIB DEFINES += BOOST_ALL_NO_LIB
# Use one of the following options # Use one of the following options
DEFINES += BOOST_SYSTEM_STATIC_LINK DEFINES += BOOST_SYSTEM_STATIC_LINK
#DEFINES += BOOST_SYSTEM_DYN_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 encountered build error with boost version <= 1.59 # Enable if encountered build error with boost version <= 1.59
#DEFINES += BOOST_NO_CXX11_RVALUE_REFERENCES #DEFINES += BOOST_NO_CXX11_RVALUE_REFERENCES

3
winconf.pri
Unescape View File

@ -6,6 +6,9 @@ DEFINES += BOOST_EXCEPTION_DISABLE
DEFINES += TORRENT_USE_OPENSSL DEFINES += TORRENT_USE_OPENSSL
DEFINES += TORRENT_DISABLE_RESOLVE_COUNTRIES DEFINES += TORRENT_DISABLE_RESOLVE_COUNTRIES
DEFINES += NTDDI_VERSION=0x06010000
DEFINES += _WIN32_WINNT=0x0601
DEFINES += _WIN32_IE=0x0601
DEFINES += UNICODE DEFINES += UNICODE
DEFINES += _UNICODE DEFINES += _UNICODE
DEFINES += WIN32 DEFINES += WIN32

Write Preview
Loading…
Cancel
Save