Move Windows.h defines to the build system

Author: janisozaur

Source/System/StandardIncludes.h

@@ -4,45 +4,6 @@
 #define _HAS_AUTO_PTR_ETC 1
 #define _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
 
-// Disable a bunch of unneeded crap in WinAPI (on top of WIN32_LEAN_AND_MEAN)
-#ifdef _WIN32
-#define NOMINMAX
-#define NOGDI
-#define NOKERNEL
-#define NONLS
-#define NOMEMMGR
-#define NOGDICAPMASKS
-#define NOVIRTUALKEYCODES
-#define NOWINMESSAGES
-#define NOWINSTYLES
-#define NOMETAFILE
-#define NOSCROLL
-#define NOTEXTMETRIC
-#define NOCOMM
-#define NOKANJI
-#define NOHELP
-#define NOPROFILER
-#define NODEFERWINDOWPOS
-#define NOMCX
-#define NOMENUS
-#define NOICONS
-#define NOKEYSTATES
-#define NOSYSCOMMANDS
-#define NORASTEROPS
-#define NOSHOWWINDOW
-#define OEMRESOURCE
-#define NOATOM
-#define NODRAWTEXT
-#define NOCOLOR
-#define NOCTLMGR
-#define NOMSG
-#define NOOPENFILE
-#define NOSERVICE
-#define NOSOUND
-#define NOWH
-#define NOWINOFFSETS
-#endif
-
 // Inclusion of relevant C++ Standard Library headers.
 #include <cstdlib>
 #include <cstdarg>

meson.build

@@ -78,7 +78,47 @@ elif compiler.get_argument_syntax()== 'msvc'
   if host_machine.cpu_family() == 'x86'
     elfname += ' x86'
   endif
-  preprocessor_flags += ['-D_CRT_SECURE_NO_DEPRECATE', '-D_WINDOWS', '-DWIN32', '-DWIN32_LEAN_AND_MEAN']
+  preprocessor_flags += [
+    '-D_CRT_SECURE_NO_DEPRECATE',
+    '-D_WINDOWS',
+    '-DWIN32',
+    '-DWIN32_LEAN_AND_MEAN',
+    '-DNOMINMAX',
+    '-DNOGDI',
+    '-DNOKERNEL',
+    '-DNONLS',
+    '-DNOMEMMGR',
+    '-DNOGDICAPMASKS',
+    '-DNOVIRTUALKEYCODES',
+    '-DNOWINMESSAGES',
+    '-DNOWINSTYLES',
+    '-DNOMETAFILE',
+    '-DNOSCROLL',
+    '-DNOTEXTMETRIC',
+    '-DNOCOMM',
+    '-DNOKANJI',
+    '-DNOHELP',
+    '-DNOPROFILER',
+    '-DNODEFERWINDOWPOS',
+    '-DNOMCX',
+    '-DNOMENUS',
+    '-DNOICONS',
+    '-DNOKEYSTATES',
+    '-DNOSYSCOMMANDS',
+    '-DNORASTEROPS',
+    '-DNOSHOWWINDOW',
+    '-DOEMRESOURCE',
+    '-DNOATOM',
+    '-DNODRAWTEXT',
+    '-DNOCOLOR',
+    '-DNOCTLMGR',
+    '-DNOMSG',
+    '-DNOOPENFILE',
+    '-DNOSERVICE',
+    '-DNOSOUND',
+    '-DNOWH',
+    '-DNOWINOFFSETS'
+  ]
   link_args+=['-ignore:4099', '-ignore:4217']
   buildtype_debug = get_option('debug')
   if buildtype_debug