diff options
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() | |||
| 144 | add_subdirectory(nx_tzdb) | 144 | add_subdirectory(nx_tzdb) |
| 145 | 145 | ||
| 146 | # VMA | 146 | # VMA |
| 147 | add_library(vma vma/vma.cpp) | 147 | if (NOT TARGET GPUOpen::VulkanMemoryAllocator) |
| 148 | target_include_directories(vma PUBLIC ./vma/VulkanMemoryAllocator/include) | 148 | add_subdirectory(VulkanMemoryAllocator) |
| 149 | target_link_libraries(vma PRIVATE Vulkan::Headers) | 149 | endif() |
| 150 | 150 | ||
| 151 | if (NOT TARGET LLVM::Demangle) | 151 | if (NOT TARGET LLVM::Demangle) |
| 152 | add_library(demangle demangle/ItaniumDemangle.cpp) | 152 | 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 @@ | |||
| 1 | // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 4 | #define VMA_IMPLEMENTATION | ||
| 5 | #define VMA_STATIC_VULKAN_FUNCTIONS 0 | ||
| 6 | #define VMA_DYNAMIC_VULKAN_FUNCTIONS 1 | ||
| 7 | |||
| 8 | #include <vk_mem_alloc.h> \ No newline at end of file | ||