From c3050c1b48040ee1c66f7e84efa8e49fbe35a3e3 Mon Sep 17 00:00:00 2001 From: Alexandre Bouvier Date: Tue, 27 Jun 2023 22:54:33 +0200 Subject: cmake: allow using system VMA library --- externals/CMakeLists.txt | 6 +++--- externals/VulkanMemoryAllocator | 1 + externals/vma/VulkanMemoryAllocator | 1 - externals/vma/vma.cpp | 8 -------- 4 files changed, 4 insertions(+), 12 deletions(-) create mode 160000 externals/VulkanMemoryAllocator delete mode 160000 externals/vma/VulkanMemoryAllocator delete mode 100644 externals/vma/vma.cpp (limited to 'externals') diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 4ff588851..1f7cd598e 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -144,9 +144,9 @@ endif() add_subdirectory(nx_tzdb) # VMA -add_library(vma vma/vma.cpp) -target_include_directories(vma PUBLIC ./vma/VulkanMemoryAllocator/include) -target_link_libraries(vma PRIVATE Vulkan::Headers) +if (NOT TARGET GPUOpen::VulkanMemoryAllocator) + add_subdirectory(VulkanMemoryAllocator) +endif() if (NOT TARGET LLVM::Demangle) add_library(demangle demangle/ItaniumDemangle.cpp) diff --git a/externals/VulkanMemoryAllocator b/externals/VulkanMemoryAllocator new file mode 160000 index 000000000..9b0fc3e7b --- /dev/null +++ b/externals/VulkanMemoryAllocator @@ -0,0 +1 @@ +Subproject commit 9b0fc3e7b02afe97895eb3e945fe800c3a7485ac diff --git a/externals/vma/VulkanMemoryAllocator b/externals/vma/VulkanMemoryAllocator deleted file mode 160000 index 0aa3989b8..000000000 --- a/externals/vma/VulkanMemoryAllocator +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0aa3989b8f382f185fdf646cc83a1d16fa31d6ab diff --git a/externals/vma/vma.cpp b/externals/vma/vma.cpp deleted file mode 100644 index 1fe2cf52b..000000000 --- a/externals/vma/vma.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#define VMA_IMPLEMENTATION -#define VMA_STATIC_VULKAN_FUNCTIONS 0 -#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1 - -#include \ No newline at end of file -- cgit v1.2.3