Enabled warning level 4 in Visual Studio for compilation of vk_mem_alloc.h.

This commit is contained in:
Adam Sawicki 2017-07-04 14:57:53 +02:00
parent b2c2d3bd0b
commit 86ccd63a98

View File

@ -27,8 +27,11 @@
#define VK_USE_PLATFORM_WIN32_KHR #define VK_USE_PLATFORM_WIN32_KHR
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
#pragma warning(push, 4)
#pragma warning(disable: 4127) // warning C4127: conditional expression is constant
#define VMA_IMPLEMENTATION #define VMA_IMPLEMENTATION
#include "vk_mem_alloc.h" #include "vk_mem_alloc.h"
#pragma warning(pop)
#define MATHFU_COMPILE_WITHOUT_SIMD_SUPPORT #define MATHFU_COMPILE_WITHOUT_SIMD_SUPPORT
#include <mathfu/glsl_mappings.h> #include <mathfu/glsl_mappings.h>
@ -1707,7 +1710,7 @@ int main()
RECT rect = { 0, 0, g_SizeX, g_SizeY }; RECT rect = { 0, 0, g_SizeX, g_SizeY };
AdjustWindowRectEx(&rect, style, FALSE, exStyle); AdjustWindowRectEx(&rect, style, FALSE, exStyle);
HWND hWnd = CreateWindowEx( CreateWindowEx(
exStyle, WINDOW_CLASS_NAME, APP_TITLE_W, style, exStyle, WINDOW_CLASS_NAME, APP_TITLE_W, style,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
NULL, NULL, g_hAppInstance, NULL); NULL, NULL, g_hAppInstance, NULL);