eden-emu/VulkanMemoryAllocator
14
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git synced 2025-05-15 01:08:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #353 from juan-lunarg/juan/include_nitpick

Browse source 
Fixup include of "vk_mem_alloc.h"
This commit is contained in:
Adam Sawicki 2023-07-12 09:50:24 +02:00 • committed by GitHub
commit 2a28bc4b39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CMakeLists.txt
View file

@ -44,6 +44,8 @@ else()
target_link_libraries(VmaSample PUBLIC Vulkan::Headers) target_link_libraries(VmaSample PUBLIC Vulkan::Headers)
endif() endif()
target_link_libraries(VmaSample PRIVATE GPUOpen::VulkanMemoryAllocator)
target_compile_definitions(VmaSample PUBLIC target_compile_definitions(VmaSample PUBLIC
VMA_STATIC_VULKAN_FUNCTIONS=$<BOOL:${VMA_STATIC_VULKAN_FUNCTIONS}> VMA_STATIC_VULKAN_FUNCTIONS=$<BOOL:${VMA_STATIC_VULKAN_FUNCTIONS}>
VMA_DYNAMIC_VULKAN_FUNCTIONS=$<BOOL:${VMA_DYNAMIC_VULKAN_FUNCTIONS}> VMA_DYNAMIC_VULKAN_FUNCTIONS=$<BOOL:${VMA_DYNAMIC_VULKAN_FUNCTIONS}>

2
src/VmaUsage.h
View file

@ -95,7 +95,7 @@ include all public interface declarations. Example:
#pragma clang diagnostic ignored "-Wnullability-completeness" #pragma clang diagnostic ignored "-Wnullability-completeness"
#endif #endif
#include "../include/vk_mem_alloc.h" #include "vk_mem_alloc.h"
#ifdef __clang__ #ifdef __clang__
#pragma clang diagnostic pop #pragma clang diagnostic pop