From 0d0dbc2886436c6c01a1e89e45b7808fb6a268c6 Mon Sep 17 00:00:00 2001 From: Matt Borgerson Date: Fri, 26 Jul 2024 17:21:01 -0700 Subject: [PATCH] meson: Add -DVK_NO_PROTOTYPES compile args on volk --- thirdparty/meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/thirdparty/meson.build b/thirdparty/meson.build index 99ecbd2796..43dff02fe1 100644 --- a/thirdparty/meson.build +++ b/thirdparty/meson.build @@ -1,10 +1,10 @@ if vulkan.found() -libvma = static_library('vma', sources: 'vma.cc', include_directories: 'VulkanMemoryAllocator/include', dependencies: vulkan) -vma = declare_dependency(include_directories: 'VulkanMemoryAllocator/include', link_with: libvma) +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) -libvolk = static_library('volk', sources: 'volk/volk.c', dependencies: vulkan) -volk = declare_dependency(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) 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)