diff --git a/config/lib/VulkanMemoryAllocator.cmake b/config/lib/VulkanMemoryAllocator.cmake index cb9e598bfb7ad685e37005b2aa2b0ca5e248317a..c918bd2933ba1c6c88338f7921b75a4233501bbc 100644 --- a/config/lib/VulkanMemoryAllocator.cmake +++ b/config/lib/VulkanMemoryAllocator.cmake @@ -1,7 +1,6 @@ if ((EXISTS "${vkcv_lib_path}/VulkanMemoryAllocator") AND (EXISTS "${vkcv_lib_path}/VulkanMemoryAllocator-Hpp")) - set(VMA_PATH "${vkcv_lib_path}/VulkanMemoryAllocator" CACHE INTERNAL "") set(VMA_HPP_PATH "${vkcv_lib_path}/VulkanMemoryAllocator-Hpp" CACHE INTERNAL "") set(VMA_RECORDING_ENABLED OFF CACHE INTERNAL "") diff --git a/vma/CMakeLists.txt b/vma/CMakeLists.txt index 75089d64d307a85153ee02c5532a03bed0efd2b3..a2c018f2b4894e5ce8e2851ca10f981e2af36605 100644 --- a/vma/CMakeLists.txt +++ b/vma/CMakeLists.txt @@ -4,7 +4,6 @@ project(VulkanMemoryAllocator) find_package(Vulkan REQUIRED) -option(VMA_PATH "Location of official API and headers" "") option(VMA_HPP_PATH "Location of C++ headers" "") message(STATUS "VMA_BUILD_SAMPLE = ${VMA_BUILD_SAMPLE}") @@ -28,9 +27,7 @@ message(STATUS "VMA_DEBUG_INITIALIZE_ALLOCATIONS = ${VMA_DEBUG_INITIALIZE_ALLOCA message(STATUS "VMA_DEBUG_GLOBAL_MUTEX = ${VMA_DEBUG_GLOBAL_MUTEX}") message(STATUS "VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT = ${VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT}") -set(VMA_LIBRARY_SOURCE_FILES ${VMA_PATH}/src/VmaUsage.cpp) - -add_library(VulkanMemoryAllocator ${VMA_LIBRARY_SOURCE_FILES}) +add_library(VulkanMemoryAllocator vma.cpp) set_target_properties( VulkanMemoryAllocator PROPERTIES diff --git a/vma/vma.cpp b/vma/vma.cpp new file mode 100644 index 0000000000000000000000000000000000000000..0b92d5b609273abdde288883b91b9f74241e8089 --- /dev/null +++ b/vma/vma.cpp @@ -0,0 +1,3 @@ + +#define VMA_IMPLEMENTATION +#include "vk_mem_alloc.hpp"