mirror of
https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
synced 2024-11-05 12:20:07 +00:00
Merge branch 'master' of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
This commit is contained in:
commit
d619fb14a8
@ -26,7 +26,9 @@
|
|||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
#include <Windows.h>
|
#include <Windows.h>
|
||||||
|
|
||||||
#define VK_USE_PLATFORM_WIN32_KHR
|
#if !defined(VK_USE_PLATFORM_WIN32_KHR)
|
||||||
|
#define VK_USE_PLATFORM_WIN32_KHR
|
||||||
|
#endif // #if !defined(VK_USE_PLATFORM_WIN32_KHR)
|
||||||
#include <vulkan/vulkan.h>
|
#include <vulkan/vulkan.h>
|
||||||
|
|
||||||
//#define VMA_USE_STL_CONTAINERS 1
|
//#define VMA_USE_STL_CONTAINERS 1
|
||||||
|
@ -28,7 +28,9 @@
|
|||||||
#define NOMINMAX
|
#define NOMINMAX
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
#include <Windows.h>
|
#include <Windows.h>
|
||||||
#define VK_USE_PLATFORM_WIN32_KHR
|
#if !defined(VK_USE_PLATFORM_WIN32_KHR)
|
||||||
|
#define VK_USE_PLATFORM_WIN32_KHR
|
||||||
|
#endif // #if !defined(VK_USE_PLATFORM_WIN32_KHR)
|
||||||
|
|
||||||
#else // #ifdef _WIN32
|
#else // #ifdef _WIN32
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user