Move WIN32_LEAN_AND_MEAN and NOMINMAX into flags

They're literally always defined thusfar, and it's always possible to
include specific headers for other stuff. So, rather than litter the
source with defines (which might not even work in the likes of os.h if
some other system header already decided to define/include stuff), let's
just define it at the build script level.

4 files changed, 1 insertions, 7 deletions

diff --git a/compile.bat b/compile.bat
index 3f4fe78..0f88cee 100644
--- a/compile.bat
+++ b/compile.bat
@@ -31,7 +31,7 @@ goto :main
 for /F %%b in ("%1") do set basename=%%~nb

 set objs=%objs% .build/%basename%.o

 %CC% -m32 -c -flto %cflags% %warnings% -I.build/include -D_CRT_SECURE_NO_WARNINGS -D_DLL ^

--DFILE_BASENAME=%basename% -o .build/%basename%.o %1 || exit /b

+-DWIN32_LEAN_AND_MEAN -DNOMINMAX -DFILE_BASENAME=%basename% -o .build/%basename%.o %1 || exit /b

 goto :eof

 

 :main

diff --git a/src/dbg.c b/src/dbg.c
index c7af49a..06b88f8 100644
--- a/src/dbg.c
+++ b/src/dbg.c
@@ -15,8 +15,6 @@
  */
 
 #ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#define NOMINMAX
 #include <Windows.h>
 #endif
 
diff --git a/src/os.h b/src/os.h
index 0e30005..d789717 100644
--- a/src/os.h
+++ b/src/os.h
@@ -28,8 +28,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #ifdef _WIN32
-#define NOMINMAX
-#define WIN32_LEAN_AND_MEAN
 #include <io.h>
 #include <wchar.h>
 // DUMB HACK: noreturn.h is alphabetically before os.h so including it after
diff --git a/src/rinput.c b/src/rinput.c
index 170fd3e..867b5be 100644
--- a/src/rinput.c
+++ b/src/rinput.c
@@ -17,8 +17,6 @@
 // NOTE: compiled on Windows only. All Linux Source releases are new enough to
 // have raw input already.
 
-#define WIN32_LEAN_AND_MEAN
-#define NOMINMAX
 #include <stdbool.h>
 #include <Windows.h>