added more #define NOMINMAX, removed redundant #include <windows.h>

DSPNerd · Jun 4, 2020 · cd76dfa · cd76dfa
1 parent d3c41e6
commit cd76dfa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/sokol_app.h b/sokol_app.h
@@ -3263,6 +3263,8 @@ _SOKOL_PRIVATE const _sapp_gl_fbconfig* _sapp_gl_choose_fbconfig(const _sapp_gl_
 #if defined(_WIN32)
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
 #define NOMINMAX
 #endif
 #include <windows.h>

diff --git a/sokol_audio.h b/sokol_audio.h
@@ -469,6 +469,9 @@ inline void saudio_setup(const saudio_desc& desc) { return saudio_setup(&desc);
     #ifndef WIN32_LEAN_AND_MEAN
     #define WIN32_LEAN_AND_MEAN
     #endif
+    #ifndef NOMINMAX
+    #define NOMINMAX
+    #endif
     #include <windows.h>
     #include <synchapi.h>
     #pragma comment (lib, "kernel32.lib")

diff --git a/sokol_fetch.h b/sokol_fetch.h
@@ -1002,6 +1002,9 @@ inline void sfetch_setup(const sfetch_desc_t& desc) { return sfetch_setup(&desc)
     #ifndef WIN32_LEAN_AND_MEAN
     #define WIN32_LEAN_AND_MEAN
     #endif
+    #ifndef NOMINMAX
+    #define NOMINMAX
+    #endif
     #include <windows.h>
     #define _SFETCH_PLATFORM_WINDOWS (1)
     #define _SFETCH_PLATFORM_EMSCRIPTEN (0)

diff --git a/sokol_gfx.h b/sokol_gfx.h
@@ -2463,7 +2463,9 @@ inline void sg_init_pass(sg_pass pass_id, const sg_pass_desc& desc) { return sg_
     #ifndef WIN32_LEAN_AND_MEAN
     #define WIN32_LEAN_AND_MEAN
     #endif
-    #include <windows.h>
+    #ifndef NOMINMAX
+    #define NOMINMAX
+    #endif
     #include <d3d11.h>
     #include <d3dcompiler.h>
     #if (defined(WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP))