cmake: Specify NOMINMAX all the time on Windows

This prevents the Windows headers from defining min/max macros.
obsproject · Oct 12, 2024 · 815416a · 815416a
1 parent b1fddbc
commit 815416a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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
@@ -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__)