From 2800b8d22a537e481c2f4fbecbbe01dc24fa8365 Mon Sep 17 00:00:00 2001 From: Matt Borgerson Date: Fri, 26 Jul 2024 17:21:01 -0700 Subject: [PATCH] meson: Move VMA options into meson config --- hw/xbox/nv2a/pgraph/vk/renderer.h | 3 --- thirdparty/meson.build | 8 ++++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/xbox/nv2a/pgraph/vk/renderer.h b/hw/xbox/nv2a/pgraph/vk/renderer.h index 9834525abd..f2d6bedbd3 100644 --- a/hw/xbox/nv2a/pgraph/vk/renderer.h +++ b/hw/xbox/nv2a/pgraph/vk/renderer.h @@ -35,9 +35,6 @@ #include #include #include - -#define VMA_STATIC_VULKAN_FUNCTIONS 1 -#define VMA_DYNAMIC_VULKAN_FUNCTIONS 0 #include #include "debug.h" diff --git a/thirdparty/meson.build b/thirdparty/meson.build index 43dff02fe1..fed4772112 100644 --- a/thirdparty/meson.build +++ b/thirdparty/meson.build @@ -3,8 +3,12 @@ if vulkan.found() libvolk = static_library('volk', sources: 'volk/volk.c', c_args: ['-DVK_NO_PROTOTYPES'], dependencies: vulkan) volk = declare_dependency(compile_args: ['-DVK_NO_PROTOTYPES'], include_directories: 'volk', link_with: libvolk, dependencies: vulkan) -libvma = static_library('vma', sources: 'vma.cc', include_directories: 'VulkanMemoryAllocator/include', dependencies: [vulkan, volk]) -vma = declare_dependency(include_directories: 'VulkanMemoryAllocator/include', link_with: libvma) +vma_defns = [ + '-DVMA_STATIC_VULKAN_FUNCTIONS=1', + '-DVMA_DYNAMIC_VULKAN_FUNCTIONS=0', +] +libvma = static_library('vma', sources: 'vma.cc', c_args: vma_defns, include_directories: 'VulkanMemoryAllocator/include', dependencies: [vulkan, volk]) +vma = declare_dependency(compile_args: vma_defns, include_directories: 'VulkanMemoryAllocator/include', link_with: libvma) libspirv_reflect = static_library('spirv_reflect', sources: 'SPIRV-Reflect/spirv_reflect.c', dependencies: vulkan) spirv_reflect = declare_dependency(include_directories: 'SPIRV-Reflect', link_with: libspirv_reflect, dependencies: vulkan)