diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-01 15:35:00 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-01 16:28:20 +0200 |
| commit | 516b3bb88fb05cc7f4d2c1c1736bffffae921b70 (patch) | |
| tree | ad7ec431a6fcf2901c9150148a37e2751e73bdeb /thirdparty | |
| parent | e53cbba36cf6cbf4f42621a0650ca8e57989379e (diff) | |
Fix Clang warnings on Windows
Fixes #37490.
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/README.md | 2 | ||||
| -rw-r--r-- | thirdparty/vulkan/vk_enum_string_helper.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md index 3d41c9d166..95a6902089 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -574,6 +574,8 @@ Files extracted from upstream source: `vk_enum_string_helper.h` is taken from the matching `Vulkan-ValidationLayers` SDK release: https://github.com/KhronosGroup/Vulkan-ValidationLayers/blob/master/layers/generated/vk_enum_string_helper.h +Includes custom change to disable MSVC pragma, might be upstreamed via: +https://github.com/KhronosGroup/Vulkan-ValidationLayers/pull/1666 `vk_mem_alloc.h` is taken from https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator Version: 2.3.0 diff --git a/thirdparty/vulkan/vk_enum_string_helper.h b/thirdparty/vulkan/vk_enum_string_helper.h index 00c2b9d1d5..1c99b31270 100644 --- a/thirdparty/vulkan/vk_enum_string_helper.h +++ b/thirdparty/vulkan/vk_enum_string_helper.h @@ -31,7 +31,7 @@ #pragma once -#ifdef _WIN32 +#ifdef _MSC_VER #pragma warning( disable : 4065 ) #endif |