Fix cpm sadness

Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2025-08-30 17:13:12 -04:00
parent 8388618930
commit 70ca0a5dce
4 changed files with 12 additions and 19536 deletions

View File

@ -147,6 +147,12 @@ add_subdirectory(nx_tzdb)
# VMA
AddJsonPackage(vulkan-memory-allocator)
# sadness
if (VulkanMemoryAllocator_ADDED)
set(VulkanMemoryAllocator_ADDED ON PARENT_SCOPE)
set(VulkanMemoryAllocator_SOURCE_DIR "${VulkanMemoryAllocator_SOURCE_DIR}" PARENT_SCOPE)
endif()
if (NOT TARGET LLVM::Demangle)
add_library(demangle demangle/ItaniumDemangle.cpp)
target_include_directories(demangle PUBLIC ./demangle)

View File

@ -332,6 +332,11 @@ target_link_options(video_core PRIVATE ${FFmpeg_LDFLAGS})
add_dependencies(video_core host_shaders)
target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE})
# sadness
if (VulkanMemoryAllocator_ADDED)
target_include_directories(video_core PRIVATE ${VulkanMemoryAllocator_SOURCE_DIR}/include)
endif()
target_link_libraries(video_core PRIVATE sirit Vulkan::Headers Vulkan::UtilityHeaders GPUOpen::VulkanMemoryAllocator)
if (ENABLE_NSIGHT_AFTERMATH)

File diff suppressed because it is too large Load Diff

View File

@ -10,4 +10,4 @@
#define VMA_STATIC_VULKAN_FUNCTIONS 0
#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
#include "video_core/vulkan_common/vk_mem_alloc.h"
#include "vk_mem_alloc.h"