Skip to content

Commit a900b56

Browse files
Merge pull request #87 from Nyufu/clang_cl_support
Added clang compile support on windows
2 parents b6c43eb + 641a16c commit a900b56

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

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

66-
#include "vk_mem_alloc.h"
67-
68-
#pragma warning(pop)
69-
70-
#else // #ifdef _WIN32
74+
#endif // #ifdef _MSVC_LANG
7175

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

77-
#include <vulkan/vulkan.h>
7884
#include "vk_mem_alloc.h"
7985

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

84-
#endif // #ifdef _WIN32
85-
90+
#ifdef _MSVC_LANG
91+
#pragma warning(pop)
8692
#endif
93+
94+
#endif

0 commit comments

Comments
 (0)