From 295aad180021b607040a7507ce16741d23b8aace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= Date: Tue, 6 Aug 2024 07:26:08 +0200 Subject: [PATCH] Mark dlls as link-time dependencies of powder.exe So they get copied into the build site even if you invoke only the powder build target, rather than all build targets by not specifying one. Case in point: meson compile vs meson compile powder wherein the latter will build powder.exe but will not copy the dlls into the build site, which are required by powder.exe. --- meson.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index ba232963d..adbd78014 100644 --- a/meson.build +++ b/meson.build @@ -334,6 +334,7 @@ else project_cpp_args += args_ccomp_sse endif +copied_dlls = [] if host_platform == 'windows' args_ccomp_win = [] defs_ccomp_win = [] @@ -362,7 +363,7 @@ if host_platform == 'windows' do_copy = true endif if do_copy - fs.copyfile(dll_input, dll_output) + copied_dlls += [ fs.copyfile(dll_input, dll_output) ] endif endforeach endif @@ -481,6 +482,7 @@ if get_option('build_powder') cpp_args: project_cpp_args, link_args: project_link_args, dependencies: powder_deps, + link_depends: copied_dlls, ) subdir('android') else @@ -495,6 +497,7 @@ if get_option('build_powder') dependencies: powder_deps, export_dynamic: project_export_dynamic, install: true, + link_depends: copied_dlls, ) endif endif @@ -523,6 +526,7 @@ if get_option('build_render') link_args: render_link_args, dependencies: render_deps, export_dynamic: project_export_dynamic, + link_depends: copied_dlls, ) endif @@ -547,5 +551,6 @@ if get_option('build_font') link_args: project_link_args, dependencies: font_deps, export_dynamic: project_export_dynamic, + link_depends: copied_dlls, ) endif