mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-09-01 20:12:50 +02:00
Code Issues Projects Releases Wiki Activity

Mark dlls as link-time dependencies of powder.exe

Browse Source 
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.
This commit is contained in:
Tamás Bálint Misius
2024-08-06 07:26:08 +02:00
parent c97cc1ec51
commit 295aad1800
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
meson.build
View File

@@ -334,6 +334,7 @@ else
project_cpp_args += args_ccomp_sse project_cpp_args += args_ccomp_sse
endif endif
copied_dlls = []
if host_platform == 'windows' if host_platform == 'windows'
args_ccomp_win = [] args_ccomp_win = []
defs_ccomp_win = [] defs_ccomp_win = []
@@ -362,7 +363,7 @@ if host_platform == 'windows'
do_copy = true do_copy = true
endif endif
if do_copy if do_copy
fs.copyfile(dll_input, dll_output) copied_dlls += [ fs.copyfile(dll_input, dll_output) ]
endif endif
endforeach endforeach
endif endif
@@ -481,6 +482,7 @@ if get_option('build_powder')
cpp_args: project_cpp_args, cpp_args: project_cpp_args,
link_args: project_link_args, link_args: project_link_args,
dependencies: powder_deps, dependencies: powder_deps,
link_depends: copied_dlls,
) )
subdir('android') subdir('android')
else else
@@ -495,6 +497,7 @@ if get_option('build_powder')
dependencies: powder_deps, dependencies: powder_deps,
export_dynamic: project_export_dynamic, export_dynamic: project_export_dynamic,
install: true, install: true,
link_depends: copied_dlls,
) )
endif endif
endif endif
@@ -523,6 +526,7 @@ if get_option('build_render')
link_args: render_link_args, link_args: render_link_args,
dependencies: render_deps, dependencies: render_deps,
export_dynamic: project_export_dynamic, export_dynamic: project_export_dynamic,
link_depends: copied_dlls,
) )
endif endif
@@ -547,5 +551,6 @@ if get_option('build_font')
link_args: project_link_args, link_args: project_link_args,
dependencies: font_deps, dependencies: font_deps,
export_dynamic: project_export_dynamic, export_dynamic: project_export_dynamic,
link_depends: copied_dlls,
) )
endif endif