Skip to content

Commit 641a16c

Browse files
author
Andras Nyiscsak
committed
Added clang compile support on windows
1 parent 8317ba9 commit 641a16c

1 file changed

Lines changed: 16 additions & 8 deletions

File tree

src/VmaUsage.h

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@
3030
#include <Windows.h>
3131
#define VK_USE_PLATFORM_WIN32_KHR
3232

33+
#else // #ifdef _WIN32
34+
35+
#include <vulkan/vulkan.h>
36+
37+
#endif // #ifdef _WIN32
38+
39+
#ifdef _MSVC_LANG
40+
3341
// Uncomment to test including `vulkan.h` on your own before including VMA.
3442
//#include <vulkan/vulkan.h>
3543

@@ -62,24 +70,24 @@ include all public interface declarations. Example:
6270
#pragma warning(disable: 4189) // local variable is initialized but not referenced
6371
#pragma warning(disable: 4324) // structure was padded due to alignment specifier
6472

65-
#include "vk_mem_alloc.h"
66-
67-
#pragma warning(pop)
68-
69-
#else // #ifdef _WIN32
73+
#endif // #ifdef _MSVC_LANG
7074

7175
#ifdef __clang__
7276
#pragma clang diagnostic push
7377
#pragma clang diagnostic ignored "-Wtautological-compare" // comparison of unsigned expression < 0 is always false
78+
#pragma clang diagnostic ignored "-Wunused-private-field"
79+
#pragma clang diagnostic ignored "-Wunused-parameter"
80+
#pragma clang diagnostic ignored "-Wmissing-field-initializers"
7481
#endif
7582

76-
#include <vulkan/vulkan.h>
7783
#include "vk_mem_alloc.h"
7884

7985
#ifdef __clang__
8086
#pragma clang diagnostic pop
8187
#endif
8288

83-
#endif // #ifdef _WIN32
84-
89+
#ifdef _MSVC_LANG
90+
#pragma warning(pop)
8591
#endif
92+
93+
#endif

0 commit comments

Comments
 (0)