summaryrefslogtreecommitdiff
path: root/externals
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--externals/CMakeLists.txt6
m---------externals/VulkanMemoryAllocator0
m---------externals/vma/VulkanMemoryAllocator0
-rw-r--r--src/video_core/vulkan_common/vma.cpp (renamed from externals/vma/vma.cpp)0
4 files changed, 3 insertions, 3 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()
144add_subdirectory(nx_tzdb) 144add_subdirectory(nx_tzdb)
145 145
146# VMA 146# VMA
147add_library(vma vma/vma.cpp) 147if (NOT TARGET GPUOpen::VulkanMemoryAllocator)
148target_include_directories(vma PUBLIC ./vma/VulkanMemoryAllocator/include) 148 add_subdirectory(VulkanMemoryAllocator)
149target_link_libraries(vma PRIVATE Vulkan::Headers) 149endif()
150 150
151if (NOT TARGET LLVM::Demangle) 151if (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/src/video_core/vulkan_common/vma.cpp
index 1fe2cf52b..1fe2cf52b 100644
--- a/externals/vma/vma.cpp
+++ b/src/video_core/vulkan_common/vma.cpp