From 465ddb814678878ebb132c36266fef1d9a667edf Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 20 Sep 2024 23:02:38 +0300 Subject: [PATCH] Meson: Make modpack installer build to depend on verhdr See RM #896 Signed-off-by: Marko Lindqvist --- meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index a5a5d9e63e..ebb0e871d7 100644 --- a/meson.build +++ b/meson.build @@ -4154,12 +4154,12 @@ endif executable('freeciv-mp-gtk3', 'tools/fcmp/mpgui_gtk3.c', mpicon, - sources: [verhdr], c_args: [ '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_20', '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_22', '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_50', '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_50'], include_directories: tool_inc, + sources: [verhdr], dependencies: [gtk322_dep, sqlite3_dep, gettext_dep], link_with: [common_lib, fcmp_common], install: true, @@ -4197,6 +4197,7 @@ executable('freeciv-mp-gtk4', '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66', '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66'], include_directories: tool_inc, + sources: [verhdr], dependencies: [gtk4_dep, sqlite3_dep, gettext_dep], link_with: [common_lib, fcmp_common], install: true, @@ -4233,6 +4234,7 @@ executable('freeciv-mp-gtk4x', '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66', '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66'], include_directories: tool_inc, + sources: [verhdr], dependencies: [gtk5_dep, sqlite3_dep, gettext_dep], link_with: [common_lib, fcmp_common], install: true, @@ -4276,6 +4278,7 @@ executable('freeciv-mp-qt', 'tools/fcmp/mpgui_qt_worker.cpp', mocced_fcmp, mpicon, include_directories: tool_inc, + sources: [verhdr], dependencies: [qt_dep, sqlite3_dep, gettext_dep], link_with: [common_lib, fcmp_common], override_options: qt_opts, @@ -4305,6 +4308,7 @@ executable('freeciv-mp-cli', 'tools/fcmp/mpcli.c', mpicon, include_directories: tool_inc, + sources: [verhdr], dependencies: [sqlite3_dep, gettext_dep], link_with: [common_lib, fcmp_common], install: true,