From 2ea255912cc54cb49bc9e88ba919d1d266f22625 Mon Sep 17 00:00:00 2001
From: Xphalnos <164882787+Xphalnos@users.noreply.github.com>
Date: Fri, 31 May 2024 15:23:27 +0200
Subject: [PATCH] Possible fix (2)

---
 externals/CMakeLists.txt                           | 3 +--
 src/video_core/renderer_vulkan/renderer_vulkan.cpp | 2 +-
 src/video_core/renderer_vulkan/vk_common.cpp       | 2 +-
 src/video_core/renderer_vulkan/vk_instance.cpp     | 2 +-
 src/video_core/texture_cache/image.cpp             | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 9c840c99b..549af45d0 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -48,8 +48,7 @@ add_library(vulkan-headers INTERFACE)
 target_include_directories(vulkan-headers SYSTEM INTERFACE ./vulkan-headers/include)
 
 # VMA
-add_library(vulkanmemoryallocator INTERFACE)
-target_include_directories(vulkanmemoryallocator SYSTEM INTERFACE ./vulkanmemoryallocator/include)
+add_subdirectory(VulkanMemoryAllocator EXCLUDE_FROM_ALL)
 
 # glslang
 set(SKIP_GLSLANG_INSTALL ON CACHE BOOL "")
diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.cpp b/src/video_core/renderer_vulkan/renderer_vulkan.cpp
index 72ee6c9be..a06a89d06 100644
--- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp
+++ b/src/video_core/renderer_vulkan/renderer_vulkan.cpp
@@ -9,7 +9,7 @@
 #include "video_core/renderer_vulkan/renderer_vulkan.h"
 #include "video_core/renderer_vulkan/vk_rasterizer.h"
 
-#include <vk_mem_alloc.h>
+#include <include/vk_mem_alloc.h>
 
 namespace Vulkan {
 
diff --git a/src/video_core/renderer_vulkan/vk_common.cpp b/src/video_core/renderer_vulkan/vk_common.cpp
index e9265ea9c..de61cbc49 100644
--- a/src/video_core/renderer_vulkan/vk_common.cpp
+++ b/src/video_core/renderer_vulkan/vk_common.cpp
@@ -5,7 +5,7 @@
 
 // Implement vma functions
 #define VMA_IMPLEMENTATION
-#include <vk_mem_alloc.h>
+#include <include/vk_mem_alloc.h>
 
 // Store the dispatch loader here
 VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
diff --git a/src/video_core/renderer_vulkan/vk_instance.cpp b/src/video_core/renderer_vulkan/vk_instance.cpp
index 3cfe8c793..fefee96bf 100644
--- a/src/video_core/renderer_vulkan/vk_instance.cpp
+++ b/src/video_core/renderer_vulkan/vk_instance.cpp
@@ -12,7 +12,7 @@
 #include "video_core/renderer_vulkan/vk_instance.h"
 #include "video_core/renderer_vulkan/vk_platform.h"
 
-#include <vk_mem_alloc.h>
+#include <include/vk_mem_alloc.h>
 
 namespace Vulkan {
 
diff --git a/src/video_core/texture_cache/image.cpp b/src/video_core/texture_cache/image.cpp
index efe3cf3dc..ba9b0d098 100644
--- a/src/video_core/texture_cache/image.cpp
+++ b/src/video_core/texture_cache/image.cpp
@@ -8,7 +8,7 @@
 #include "video_core/renderer_vulkan/vk_scheduler.h"
 #include "video_core/texture_cache/image.h"
 
-#include <vk_mem_alloc.h>
+#include <include/vk_mem_alloc.h>
 
 namespace VideoCore {