From dd1490a143908b6e914cdd2b3f71dd1a7634d0c9 Mon Sep 17 00:00:00 2001
From: Dan Paulat <dpaulat@gmail.com>
Date: Sun, 19 Nov 2023 20:56:03 -0600
Subject: [PATCH] NOMINMAX should be defined for the entire project

---
 scwx-qt/scwx-qt.cmake                                | 6 ++++++
 scwx-qt/source/scwx/qt/main/main.cpp                 | 1 -
 scwx-qt/source/scwx/qt/main/main_window.cpp          | 2 --
 scwx-qt/source/scwx/qt/manager/placefile_manager.cpp | 2 --
 scwx-qt/source/scwx/qt/manager/timeline_manager.cpp  | 2 --
 scwx-qt/source/scwx/qt/model/alert_model.cpp         | 2 --
 wxdata/wxdata.cmake                                  | 5 +++++
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
index e6f55544..73b26e82 100644
--- a/scwx-qt/scwx-qt.cmake
+++ b/scwx-qt/scwx-qt.cmake
@@ -462,6 +462,12 @@ target_compile_options(supercell-wx PRIVATE
     $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
 )
 
+if (MSVC)
+    # Don't include Windows macros
+    target_compile_options(scwx-qt PRIVATE /D "NOMINMAX")
+    target_compile_options(supercell-wx PRIVATE /D "NOMINMAX")
+endif()
+
 # Address Sanitizer options
 if (SCWX_ADDRESS_SANITIZER)
     target_compile_options(scwx-qt PRIVATE
diff --git a/scwx-qt/source/scwx/qt/main/main.cpp b/scwx-qt/source/scwx/qt/main/main.cpp
index 3b1a943e..2431b218 100644
--- a/scwx-qt/source/scwx/qt/main/main.cpp
+++ b/scwx-qt/source/scwx/qt/main/main.cpp
@@ -1,4 +1,3 @@
-#define NOMINMAX
 #define _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING
 
 #include <scwx/qt/config/radar_site.hpp>
diff --git a/scwx-qt/source/scwx/qt/main/main_window.cpp b/scwx-qt/source/scwx/qt/main/main_window.cpp
index f628f367..bd97c031 100644
--- a/scwx-qt/source/scwx/qt/main/main_window.cpp
+++ b/scwx-qt/source/scwx/qt/main/main_window.cpp
@@ -1,5 +1,3 @@
-#define NOMINMAX
-
 #include "main_window.hpp"
 #include "./ui_main_window.h"
 
diff --git a/scwx-qt/source/scwx/qt/manager/placefile_manager.cpp b/scwx-qt/source/scwx/qt/manager/placefile_manager.cpp
index 8ab8f146..4b1b0550 100644
--- a/scwx-qt/source/scwx/qt/manager/placefile_manager.cpp
+++ b/scwx-qt/source/scwx/qt/manager/placefile_manager.cpp
@@ -1,5 +1,3 @@
-#define NOMINMAX
-
 #include <scwx/qt/manager/placefile_manager.hpp>
 #include <scwx/qt/manager/font_manager.hpp>
 #include <scwx/qt/manager/resource_manager.hpp>
diff --git a/scwx-qt/source/scwx/qt/manager/timeline_manager.cpp b/scwx-qt/source/scwx/qt/manager/timeline_manager.cpp
index f7fc3f48..edcc79a5 100644
--- a/scwx-qt/source/scwx/qt/manager/timeline_manager.cpp
+++ b/scwx-qt/source/scwx/qt/manager/timeline_manager.cpp
@@ -1,5 +1,3 @@
-#define NOMINMAX
-
 #include <scwx/qt/manager/timeline_manager.hpp>
 #include <scwx/qt/manager/radar_product_manager.hpp>
 #include <scwx/qt/settings/general_settings.hpp>
diff --git a/scwx-qt/source/scwx/qt/model/alert_model.cpp b/scwx-qt/source/scwx/qt/model/alert_model.cpp
index e44e2a17..4cadff42 100644
--- a/scwx-qt/source/scwx/qt/model/alert_model.cpp
+++ b/scwx-qt/source/scwx/qt/model/alert_model.cpp
@@ -1,5 +1,3 @@
-#define NOMINMAX
-
 #include <scwx/qt/model/alert_model.hpp>
 #include <scwx/qt/config/county_database.hpp>
 #include <scwx/qt/manager/text_event_manager.hpp>
diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake
index 9e99d2d2..f8c22759 100644
--- a/wxdata/wxdata.cmake
+++ b/wxdata/wxdata.cmake
@@ -248,6 +248,11 @@ target_compile_options(wxdata PRIVATE
     $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
 )
 
+if (MSVC)
+    # Don't include Windows macros
+    target_compile_options(wxdata PRIVATE /D "NOMINMAX")
+endif()
+
 if (MSVC)
     # Produce PDB file for debug
     target_compile_options(wxdata PRIVATE "$<$<CONFIG:Release>:/Zi>")