mirrors-yuzu-emu/yuzu-mainline
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-mainline synced 2024-11-22 08:53:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

externals: Use cmake subdirectory

Browse source
This commit is contained in:
GPUCode 2023-06-25 15:08:38 +03:00
parent 75fb29e08e
commit b6c6dcc576
7 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitmodules vendored
View file

@ -55,6 +55,6 @@
[submodule "tzdb_to_nx"] [submodule "tzdb_to_nx"]
path = externals/nx_tzdb/tzdb_to_nx path = externals/nx_tzdb/tzdb_to_nx
url = https://github.com/lat9nq/tzdb_to_nx.git url = https://github.com/lat9nq/tzdb_to_nx.git
[submodule "externals/vma/vma"] [submodule "VulkanMemoryAllocator"]
path = externals/vma/vma path = externals/vma/VulkanMemoryAllocator
url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator

2
externals/CMakeLists.txt vendored
View file

@ -145,7 +145,7 @@ add_subdirectory(nx_tzdb)
# VMA # VMA
add_library(vma vma/vma.cpp) add_library(vma vma/vma.cpp)
target_include_directories(vma PUBLIC ./vma/vma/include) target_include_directories(vma PUBLIC ./vma/VulkanMemoryAllocator/include)
target_link_libraries(vma PRIVATE Vulkan::Headers) target_link_libraries(vma PRIVATE Vulkan::Headers)
if (NOT TARGET LLVM::Demangle) if (NOT TARGET LLVM::Demangle)

0
externals/vma/vma → externals/vma/VulkanMemoryAllocator vendored
View file

1
externals/vma/vma.cpp vendored
View file

@ -4,4 +4,5 @@
#define VMA_IMPLEMENTATION #define VMA_IMPLEMENTATION
#define VMA_STATIC_VULKAN_FUNCTIONS 0 #define VMA_STATIC_VULKAN_FUNCTIONS 0
#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1 #define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
#include <vk_mem_alloc.h> #include <vk_mem_alloc.h>

2
src/video_core/vulkan_common/vulkan_device.cpp
View file

@ -22,8 +22,6 @@
#include <adrenotools/bcenabler.h> #include <adrenotools/bcenabler.h>
#endif #endif
#define VMA_STATIC_VULKAN_FUNCTIONS 0
#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
#include <vk_mem_alloc.h> #include <vk_mem_alloc.h>
namespace Vulkan { namespace Vulkan {

2
src/video_core/vulkan_common/vulkan_memory_allocator.cpp
View file

@ -15,8 +15,6 @@
#include "video_core/vulkan_common/vulkan_memory_allocator.h" #include "video_core/vulkan_common/vulkan_memory_allocator.h"
#include "video_core/vulkan_common/vulkan_wrapper.h" #include "video_core/vulkan_common/vulkan_wrapper.h"
#define VMA_STATIC_VULKAN_FUNCTIONS 0
#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
#include <vk_mem_alloc.h> #include <vk_mem_alloc.h>
namespace Vulkan { namespace Vulkan {

2
src/video_core/vulkan_common/vulkan_wrapper.cpp
View file

@ -12,8 +12,6 @@
#include "video_core/vulkan_common/vulkan_wrapper.h" #include "video_core/vulkan_common/vulkan_wrapper.h"
#define VMA_STATIC_VULKAN_FUNCTIONS 0
#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
#include <vk_mem_alloc.h> #include <vk_mem_alloc.h>
namespace Vulkan::vk { namespace Vulkan::vk {