From 641a16cc9cb5fc52e4495061a30476c9514a7940 Mon Sep 17 00:00:00 2001 From: Andras Nyiscsak Date: Mon, 18 Nov 2019 15:09:34 +0100 Subject: [PATCH] Added clang compile support on windows --- src/VmaUsage.h | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/VmaUsage.h b/src/VmaUsage.h index 833ba14..870d947 100644 --- a/src/VmaUsage.h +++ b/src/VmaUsage.h @@ -30,6 +30,14 @@ #include #define VK_USE_PLATFORM_WIN32_KHR +#else // #ifdef _WIN32 + +#include + +#endif // #ifdef _WIN32 + +#ifdef _MSVC_LANG + // Uncomment to test including `vulkan.h` on your own before including VMA. //#include @@ -62,24 +70,24 @@ include all public interface declarations. Example: #pragma warning(disable: 4189) // local variable is initialized but not referenced #pragma warning(disable: 4324) // structure was padded due to alignment specifier -#include "vk_mem_alloc.h" - -#pragma warning(pop) - -#else // #ifdef _WIN32 +#endif // #ifdef _MSVC_LANG #ifdef __clang__ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wtautological-compare" // comparison of unsigned expression < 0 is always false + #pragma clang diagnostic ignored "-Wunused-private-field" + #pragma clang diagnostic ignored "-Wunused-parameter" + #pragma clang diagnostic ignored "-Wmissing-field-initializers" #endif -#include #include "vk_mem_alloc.h" #ifdef __clang__ #pragma clang diagnostic pop #endif -#endif // #ifdef _WIN32 - +#ifdef _MSVC_LANG + #pragma warning(pop) #endif + +#endif \ No newline at end of file