qbittorrent/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-30 05:00:31 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Move NOMINMAX define

Browse Source
This commit is contained in:
Chocobo1 2017-08-28 15:24:02 +08:00
parent 551ffb88ab
commit 39b56ac598
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/Modules/winconf.cmake
View File

@ -24,6 +24,7 @@ add_definitions(-DUNICODE
-D_WIN32_IE=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
) )
# and boost # and boost
set(Boost_USE_STATIC_LIBS True) set(Boost_USE_STATIC_LIBS True)

3
src/CMakeLists.txt
View File

@ -42,9 +42,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
add_definitions(-DQT_NO_CAST_TO_ASCII) add_definitions(-DQT_NO_CAST_TO_ASCII)
# Efficient construction for QString & QByteArray (Qt >= 4.8) # Efficient construction for QString & QByteArray (Qt >= 4.8)
add_definitions(-DQT_USE_QSTRINGBUILDER) add_definitions(-DQT_USE_QSTRINGBUILDER)
if (WIN32)
add_definitions(-DNOMINMAX)
endif (WIN32)
if (NOT GUI) if (NOT GUI)
add_definitions(-DDISABLE_GUI -DDISABLE_COUNTRIES_RESOLUTION) add_definitions(-DDISABLE_GUI -DDISABLE_COUNTRIES_RESOLUTION)

2
src/src.pro
View File

@ -60,8 +60,6 @@ DEFINES += QT_NO_CAST_TO_ASCII
# Efficient construction for QString & QByteArray (Qt >= 4.8) # Efficient construction for QString & QByteArray (Qt >= 4.8)
DEFINES += QT_USE_QSTRINGBUILDER DEFINES += QT_USE_QSTRINGBUILDER
win32: DEFINES += NOMINMAX
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
include(app/app.pri) include(app/app.pri)

1
winconf.pri
View File

@ -49,6 +49,7 @@ DEFINES += _CRT_SECURE_NO_DEPRECATE
DEFINES += _SCL_SECURE_NO_DEPRECATE DEFINES += _SCL_SECURE_NO_DEPRECATE
DEFINES += __USE_W32_SOCKETS DEFINES += __USE_W32_SOCKETS
DEFINES += _FILE_OFFSET_BITS=64 DEFINES += _FILE_OFFSET_BITS=64
DEFINES += NOMINMAX
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
DEFINES += TORRENT_DEBUG DEFINES += TORRENT_DEBUG