commit | 14f79094d4f972fb7f873b6f54fa3b44e6a7ccba | [log] [tgz] |
---|---|---|
author | Henrik Rydgård <hrydgard@gmail.com> | Mon Sep 24 11:18:41 2018 +0200 |
committer | Henrik Rydgård <hrydgard@gmail.com> | Mon Sep 24 11:18:41 2018 +0200 |
tree | be44447b4a1373db5de09fb2505fb92be89ff025 | |
parent | f305aebdfd9de52cdd0eb6ef06e7a0b5ddad2fb1 [diff] |
Avoid redefinition warnings of NOMINMAX if you've already defined it.
diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h index 5fdadae..f868784 100644 --- a/src/vk_mem_alloc.h +++ b/src/vk_mem_alloc.h
@@ -1369,7 +1369,9 @@ #endif #endif +#ifndef NOMINMAX #define NOMINMAX // For Windows.h +#endif #include <vulkan/vulkan.h>