mirror/VulkanMemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git synced 2024-11-22 23:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #87 from Nyufu/clang_cl_support

Browse Source 
Added clang compile support on windows
This commit is contained in:
Adam Sawicki 2019-11-18 15:18:45 +01:00 committed by GitHub
commit a900b56aed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/VmaUsage.h
View File

@ -30,6 +30,14 @@
#include <Windows.h> #include <Windows.h>
#define VK_USE_PLATFORM_WIN32_KHR #define VK_USE_PLATFORM_WIN32_KHR
#else // #ifdef _WIN32
#include <vulkan/vulkan.h>
#endif // #ifdef _WIN32
#ifdef _MSVC_LANG
// Uncomment to test including `vulkan.h` on your own before including VMA. // Uncomment to test including `vulkan.h` on your own before including VMA.
//#include <vulkan/vulkan.h> //#include <vulkan/vulkan.h>
@ -63,24 +71,24 @@ include all public interface declarations. Example:
#pragma warning(disable: 4189) // local variable is initialized but not referenced #pragma warning(disable: 4189) // local variable is initialized but not referenced
#pragma warning(disable: 4324) // structure was padded due to alignment specifier #pragma warning(disable: 4324) // structure was padded due to alignment specifier
#include "vk_mem_alloc.h" #endif // #ifdef _MSVC_LANG
#pragma warning(pop)
#else // #ifdef _WIN32
#ifdef __clang__ #ifdef __clang__
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wtautological-compare" // comparison of unsigned expression < 0 is always false #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 #endif
#include <vulkan/vulkan.h>
#include "vk_mem_alloc.h" #include "vk_mem_alloc.h"
#ifdef __clang__ #ifdef __clang__
#pragma clang diagnostic pop #pragma clang diagnostic pop
#endif #endif
#endif // #ifdef _WIN32 #ifdef _MSVC_LANG
#pragma warning(pop)
#endif #endif
#endif