Move NOMINMAX define

7 years ago · 39b56ac598
4 changed files with 2 additions and 5 deletions
--- a/cmake/Modules/winconf.cmake
+++ b/cmake/Modules/winconf.cmake
@ -24,6 +24,7 @@ add_definitions(-DUNICODE
				@@ -24,6 +24,7 @@ add_definitions(-DUNICODE
    -D_WIN32_IE=0x0501
    -D_CRT_SECURE_NO_DEPRECATE
    -D_SCL_SECURE_NO_DEPRECATE
+    -DNOMINMAX
 )
 # and boost
 set(Boost_USE_STATIC_LIBS  True)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -42,9 +42,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
				@@ -42,9 +42,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 add_definitions(-DQT_NO_CAST_TO_ASCII)
 # Efficient construction for QString & QByteArray (Qt >= 4.8)
 add_definitions(-DQT_USE_QSTRINGBUILDER)
-if (WIN32)
-    add_definitions(-DNOMINMAX)
-endif (WIN32)

 if (NOT GUI)
    add_definitions(-DDISABLE_GUI -DDISABLE_COUNTRIES_RESOLUTION)
--- a/src/src.pro
+++ b/src/src.pro
@ -60,8 +60,6 @@ DEFINES += QT_NO_CAST_TO_ASCII
				@@ -60,8 +60,6 @@ DEFINES += QT_NO_CAST_TO_ASCII
 # Efficient construction for QString & QByteArray (Qt >= 4.8)
 DEFINES += QT_USE_QSTRINGBUILDER

-win32: DEFINES += NOMINMAX
-
 INCLUDEPATH += $$PWD

 include(app/app.pri)
--- a/winconf.pri
+++ b/winconf.pri
@ -49,6 +49,7 @@ DEFINES += _CRT_SECURE_NO_DEPRECATE
				@@ -49,6 +49,7 @@ DEFINES += _CRT_SECURE_NO_DEPRECATE
 DEFINES += _SCL_SECURE_NO_DEPRECATE
 DEFINES += __USE_W32_SOCKETS
 DEFINES += _FILE_OFFSET_BITS=64
+DEFINES += NOMINMAX

 CONFIG(debug, debug|release) {
  DEFINES += TORRENT_DEBUG