| commit | 1e425dda0387df34a5b4ad7be02a2235e8ffa71d | [log] [tgz] |
|---|---|---|
| author | Adam Sawicki <Adam.Sawicki@amd.com> | Mon Sep 10 16:52:13 2018 +0200 |
| committer | Adam Sawicki <Adam.Sawicki@amd.com> | Mon Sep 10 16:52:13 2018 +0200 |
| tree | dfd1badc1dc130121e4cfa972e53492868da701f | |
| parent | c77a123a8996b1dc71ca13b16202e41ecd54efdf [diff] |
Added #ifdef NOMINMAX. Thanks Krzysztof Kondrak !
diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h index 0335da6..179e9df 100644 --- a/src/vk_mem_alloc.h +++ b/src/vk_mem_alloc.h
@@ -1369,7 +1369,9 @@ #endif #endif -#define NOMINMAX // For windows.h +#ifndef NOMINMAX + #define NOMINMAX // For windows.h +#endif #include <vulkan/vulkan.h>