From 01b94418eb7fde777c1e9d155e0a9d67dc415b9f Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 3 Jun 2024 14:19:33 +0200 Subject: [PATCH] Fix wrong usage of `extra_link_args` variable. --- meson.build | 11 +++++++---- test/meson.build | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 582ef5eff..0d9795c5b 100644 --- a/meson.build +++ b/meson.build @@ -48,12 +48,15 @@ if host_machine.system() == 'windows' and static_deps endif if host_machine.system() == 'windows' - add_project_arguments('-DNOMINMAX', language: 'cpp') - extra_libs += ['-liphlpapi'] -else - extra_link_args = [] + add_project_arguments('-DNOMINMAX', language: 'cpp') + extra_libs += ['-liphlpapi'] endif +if build_machine.system() == 'windows' + extra_libs += ['-lshlwapi', '-lwinmm'] +endif + + all_deps = [thread_dep, libicu_dep, libzim_dep, pugixml_dep, libcurl_dep, microhttpd_dep, zlib_dep, xapian_dep] inc = include_directories('include', extra_include) diff --git a/test/meson.build b/test/meson.build index aa55e1d5f..0dda34d3f 100644 --- a/test/meson.build +++ b/test/meson.build @@ -77,7 +77,7 @@ if gtest_dep.found() and not meson.is_cross_build() implicit_include_directories: false, include_directories : inc, link_with : libkiwix, - link_args: extra_link_args, + link_args: extra_libs, dependencies : all_deps + [gtest_dep], build_rpath : '$ORIGIN') test(test_name, test_exe, timeout : 160)