From 815416ada263ecc07f7eee1d2c8d45bd0955d604 Mon Sep 17 00:00:00 2001
From: Ryan Foster <ryan@obsproject.com>
Date: Fri, 11 Oct 2024 21:00:48 -0400
Subject: [PATCH] cmake: Specify NOMINMAX all the time on Windows

This prevents the Windows headers from defining min/max macros.
---
 UI/multitrack-video-output.hpp         | 2 --
 cmake/windows/compilerconfig.cmake     | 1 +
 plugins/obs-vst/headers/EditorWidget.h | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/UI/multitrack-video-output.hpp b/UI/multitrack-video-output.hpp
index 299251a0d39a95..e00d8561c4b4c9 100644
--- a/UI/multitrack-video-output.hpp
+++ b/UI/multitrack-video-output.hpp
@@ -10,8 +10,6 @@
 
 #include <QObject>
 
-#define NOMINMAX
-
 class QString;
 
 void StreamStopHandler(void *arg, calldata_t *data);
diff --git a/cmake/windows/compilerconfig.cmake b/cmake/windows/compilerconfig.cmake
index 5939d1517012d2..f891e9d381a928 100644
--- a/cmake/windows/compilerconfig.cmake
+++ b/cmake/windows/compilerconfig.cmake
@@ -78,6 +78,7 @@ add_compile_options(
 )
 
 add_compile_definitions(
+  NOMINMAX
   UNICODE
   _UNICODE
   _CRT_SECURE_NO_WARNINGS
diff --git a/plugins/obs-vst/headers/EditorWidget.h b/plugins/obs-vst/headers/EditorWidget.h
index e20429acdf62ae..ce14b584a21078 100644
--- a/plugins/obs-vst/headers/EditorWidget.h
+++ b/plugins/obs-vst/headers/EditorWidget.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QWidget>
 
 #if defined(_WIN32)
-#define NOMINMAX
 #include <QWindow>
 #include <Windows.h>
 #elif defined(__linux__)