From 85aa0a0ecba8ab5144b932c74084246f4b10ca04 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Sun, 21 Aug 2022 23:22:43 +0200 Subject: [PATCH] [dxvk] Fix meson issue for native builds --- meson.build | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 27d73d7ca..e8b15fa96 100644 --- a/meson.build +++ b/meson.build @@ -26,7 +26,11 @@ if get_option('build_id') ] endif -dxvk_include_path = include_directories('./include', './include/vulkan/include', './include/spirv/include') +dxvk_include_dirs = [ + './include', + './include/vulkan/include', + './include/spirv/include' +] if platform == 'windows' compiler_args += [ @@ -102,12 +106,18 @@ else wrc = find_program('touch') wrc_generator = generator(wrc, output : [ '@BASENAME@_ignored.h' ], arguments : [ '@OUTPUT@' ] ) - dxvk_include_path += include_directories('./include/native', './include/native/windows', './include/native/directx') + dxvk_include_dirs += [ + './include/native', + './include/native/windows', + './include/native/directx' + ] dxvk_wsi = 'sdl2' compiler_args += ['-DDXVK_WSI_SDL2'] endif +dxvk_include_path = include_directories(dxvk_include_dirs) + add_project_arguments(cpp.get_supported_arguments(compiler_args), language: 'cpp') add_project_arguments(cc.get_supported_arguments(compiler_args), language: 'c') add_project_link_arguments(cpp.get_supported_link_arguments(link_args), language: 'cpp')