diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-07-17 16:42:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-17 16:42:41 +0200 |
| commit | 5593bed08ad913ebc3b9ad17799391fb5289c2c3 (patch) | |
| tree | 43fa15d682207552d9f2aa29d080e1da13b3dd2c /externals | |
| parent | Merge pull request #11102 from v1993/your-mom-is-encrypted (diff) | |
| parent | cmake: allow using system VMA library (diff) | |
| download | yuzu-5593bed08ad913ebc3b9ad17799391fb5289c2c3.tar yuzu-5593bed08ad913ebc3b9ad17799391fb5289c2c3.tar.gz yuzu-5593bed08ad913ebc3b9ad17799391fb5289c2c3.tar.bz2 yuzu-5593bed08ad913ebc3b9ad17799391fb5289c2c3.tar.lz yuzu-5593bed08ad913ebc3b9ad17799391fb5289c2c3.tar.xz yuzu-5593bed08ad913ebc3b9ad17799391fb5289c2c3.tar.zst yuzu-5593bed08ad913ebc3b9ad17799391fb5289c2c3.zip | |
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 6 | ||||
| m--------- | externals/VulkanMemoryAllocator | 0 | ||||
| m--------- | externals/vma/VulkanMemoryAllocator | 0 | ||||
| -rw-r--r-- | externals/vma/vma.cpp | 8 |
4 files changed, 3 insertions, 11 deletions
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 +Subproject 9b0fc3e7b02afe97895eb3e945fe800c3a7485a diff --git a/externals/vma/VulkanMemoryAllocator b/externals/vma/VulkanMemoryAllocator deleted file mode 160000 -Subproject 0aa3989b8f382f185fdf646cc83a1d16fa31d6a 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 <vk_mem_alloc.h>
\ No newline at end of file |