From df5d52a2e1c80ba9aa09df63dc86eb88b5167a8f Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 3 Feb 2022 06:57:12 +0200 Subject: [PATCH 37/37] Meson: Set GLIB_VERSION_MIN_REQUIRED / GLIB_VERSION_MAX_ALLOWED See osdn #43441 Signed-off-by: Marko Lindqvist --- meson.build | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index d9621da29a..3d6baaa461 100644 --- a/meson.build +++ b/meson.build @@ -2430,7 +2430,9 @@ executable('freeciv-gtk3.22', 'client/gui-gtk-3.22/voteinfo_bar.c', 'client/gui-gtk-3.22/wldlg.c', c_args: [ '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_20', - '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_22'], + '-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: client_inc, dependencies: [gtk322_dep, net_dep, gettext_dep], link_with: client_common, @@ -2803,7 +2805,9 @@ endif executable('freeciv-mp-gtk3', 'tools/fcmp/mpgui_gtk3.c', c_args: [ '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_20', - '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_22'], + '-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, dependencies: [gtk322_dep, sqlite3_dep, gettext_dep], link_with: [common_lib, fcmp_common], @@ -2822,7 +2826,9 @@ endif executable('freeciv-mp-gtk4', 'tools/fcmp/mpgui_gtk4.c', c_args: [ '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_0', - '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_0'], + '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_0', + '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66', + '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66'], include_directories: tool_inc, dependencies: [gtk4_dep, sqlite3_dep, gettext_dep], link_with: [common_lib, fcmp_common], -- 2.34.1