diff options
| author | Andre Weissflog <floooh@gmail.com> | 2020-06-05 12:01:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-05 12:01:54 +0200 |
| commit | 26c6fb874b6daa6193194a9ea3fc7e34bf2e4bee (patch) | |
| tree | 019d5021116192c01e34fef0c4b30f559baf3518 | |
| parent | 535318bb43d403bb390384e55e6fa42e5ad6cd47 (diff) | |
| parent | cd76dfa183241b1831b81318fcd4aab5f91ead8d (diff) | |
Merge pull request #312 from garettbass/master
added `#define NOMINMAX`, removed redundant `#include <windows.h>`
| -rw-r--r-- | sokol_app.h | 4 | ||||
| -rw-r--r-- | sokol_audio.h | 3 | ||||
| -rw-r--r-- | sokol_fetch.h | 3 | ||||
| -rw-r--r-- | sokol_gfx.h | 4 |
4 files changed, 12 insertions, 2 deletions
diff --git a/sokol_app.h b/sokol_app.h index 525c8b4a..3547c71f 100644 --- a/sokol_app.h +++ b/sokol_app.h @@ -3326,6 +3326,9 @@ _SOKOL_PRIVATE const _sapp_gl_fbconfig* _sapp_gl_choose_fbconfig(const _sapp_gl_ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif +#ifndef NOMINMAX +#define NOMINMAX +#endif #include <windows.h> #include <windowsx.h> #include <shellapi.h> @@ -3359,7 +3362,6 @@ _SOKOL_PRIVATE const _sapp_gl_fbconfig* _sapp_gl_choose_fbconfig(const _sapp_gl_ #ifndef COBJMACROS #define COBJMACROS #endif -#include <windows.h> #include <d3d11.h> #include <dxgi.h> #endif diff --git a/sokol_audio.h b/sokol_audio.h index b0793627..fd34cf9c 100644 --- a/sokol_audio.h +++ b/sokol_audio.h @@ -473,6 +473,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 index 44aff84b..788d172e 100644 --- a/sokol_fetch.h +++ b/sokol_fetch.h @@ -1007,6 +1007,9 @@ inline sfetch_handle_t sfetch_send(const sfetch_request_t& request) { return sfe #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 index 71f6076b..f6b89047 100644 --- a/sokol_gfx.h +++ b/sokol_gfx.h @@ -2465,7 +2465,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> #ifdef _MSC_VER |