From: Benjamin Otte Date: Mon, 3 Jul 2023 02:45:20 +0000 (+0200) Subject: build: Include the right things X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~77^2~3 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=84737a5159936eb385b3ca267d7211cb037e3d67;p=gtk4.git build: Include the right things If we build our own targets, we need to include those. This is only relevant when adding new shaders because meson will complain that the (unused) sources don't exist as it tries to include those. And that will make the build.ninja file not be generated which would have build those shaders and would have allowed to copy them into the sources. Note that this makes builds with glslc not care about all the shader files being included with the sources, but we have CI to check that. --- diff --git a/gsk/vulkan/resources/meson.build b/gsk/vulkan/resources/meson.build index 3e5b00dafa..5075f97b83 100644 --- a/gsk/vulkan/resources/meson.build +++ b/gsk/vulkan/resources/meson.build @@ -87,8 +87,10 @@ foreach shader: gsk_private_vulkan_shaders '-o', '@OUTPUT@' ]) gsk_private_vulkan_compiled_shaders_deps += [compiled_shader, compiled_clip_shader, compiled_clip_rounded_shader] + gsk_private_vulkan_compiled_shaders += [spv_shader, clip_spv_shader, clip_rounded_spv_shader] + else + gsk_private_vulkan_compiled_shaders += files(spv_shader, clip_spv_shader, clip_rounded_spv_shader) endif - gsk_private_vulkan_compiled_shaders += files(spv_shader, clip_spv_shader, clip_rounded_spv_shader) endforeach foreach shader: gsk_private_vulkan_vertex_shaders