Small change not to #include <vulkan/vulkan.h> if it was already included (possible from a different path) before including VMA. Issue #50 Thanks @baldurk !

adam-sawicki-a · adam-sawicki-a · commit e8b01485ce08 · 2018-12-06T14:47:59.000+01:00
diff --git a/src/VmaUsage.h b/src/VmaUsage.h
@@ -8,7 +8,8 @@
 #include <Windows.h>
 #define VK_USE_PLATFORM_WIN32_KHR
 
-#include <vulkan/vulkan.h>
+// Uncomment to test including `vulkan.h` on your own before including VMA.
+//#include <vulkan/vulkan.h>
 
 /*
 In every place where you want to use Vulkan Memory Allocator, define appropriate
diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
@@ -1492,7 +1492,9 @@ available through VmaAllocatorCreateInfo::pRecordSettings.
     #define NOMINMAX // For windows.h
 #endif
 
-#include <vulkan/vulkan.h>
+#ifndef VULKAN_H_
+    #include <vulkan/vulkan.h>
+#endif
 
 #if VMA_RECORDING_ENABLED
     #include <windows.h>
