From 715a95075ba92690d4d08d777993a5391fa5a234 Mon Sep 17 00:00:00 2001
From: Robbert van der Helm <mail@robbertvanderhelm.nl>
Date: Wed, 2 Dec 2020 16:31:59 +0100
Subject: [PATCH] Add required compiler args to the Wine VST3 dep

---
 meson.build                  | 1 +
 src/wine-host/bridges/vst2.h | 2 ++
 src/wine-host/editor.h       | 2 ++
 src/wine-host/utils.h        | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/meson.build b/meson.build
index dfae7846..69ae87f6 100644
--- a/meson.build
+++ b/meson.build
@@ -217,6 +217,7 @@ if with_vst3
   vst3_sdk_hosting_wine_dep = declare_dependency(
     link_with : vst3_sdk_hosting_wine,
     include_directories : vst3_include_dir,
+    compile_args : vst3_wine_compiler_options,
   )
 endif
 
diff --git a/src/wine-host/bridges/vst2.h b/src/wine-host/bridges/vst2.h
index 5694010a..403977b5 100644
--- a/src/wine-host/bridges/vst2.h
+++ b/src/wine-host/bridges/vst2.h
@@ -18,11 +18,13 @@
 
 #include "../boost-fix.h"
 
+#ifndef NOMINMAX
 #define NOMINMAX
 #define NOSERVICE
 #define NOMCX
 #define NOIMM
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <vestige/aeffectx.h>
 #include <windows.h>
 
diff --git a/src/wine-host/editor.h b/src/wine-host/editor.h
index db725239..b03b2f2c 100644
--- a/src/wine-host/editor.h
+++ b/src/wine-host/editor.h
@@ -20,11 +20,13 @@
 #include <xcb/xcb.h>
 #pragma pop_macro("_WIN32")
 
+#ifndef NOMINMAX
 #define NOMINMAX
 #define NOSERVICE
 #define NOMCX
 #define NOIMM
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <vestige/aeffectx.h>
 #include <windows.h>
 
diff --git a/src/wine-host/utils.h b/src/wine-host/utils.h
index d9683ef7..8358800b 100644
--- a/src/wine-host/utils.h
+++ b/src/wine-host/utils.h
@@ -21,11 +21,13 @@
 #include <memory>
 #include <optional>
 
+#ifndef NOMINMAX
 #define NOMINMAX
 #define NOSERVICE
 #define NOMCX
 #define NOIMM
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 
 #include <boost/asio/io_context.hpp>