From f64b4bc3892c494e3fc066d64cebcbfa149f09fa Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 24 Nov 2021 16:48:10 +0200 Subject: [PATCH 38/38] Meson: Fix nls-enabled build for Windows See osdn #43269 Signed-off-by: Marko Lindqvist --- meson.build | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index 620035971f..53fff26da3 100644 --- a/meson.build +++ b/meson.build @@ -2372,7 +2372,7 @@ executable('freeciv-gtk3.22', c_args: [ '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_20', '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_22'], include_directories: client_inc, - dependencies: [gtk322_dep, ws2_dep], + dependencies: [gtk322_dep, ws2_dep, gettext_dep], link_with: client_common, install: true ) @@ -2464,7 +2464,7 @@ executable('freeciv-qt', 'client/gui_interface.c', mocced_client, include_directories: [client_inc, include_directories('client/gui-qt')], - dependencies: [qt5_dep, ws2_dep], + dependencies: [qt5_dep, ws2_dep, gettext_dep], link_with: client_common, install: true) @@ -2676,7 +2676,7 @@ executable('freeciv-sdl2', c_compiler.find_library('libSDL2_image', dirs: cross_lib_path), c_compiler.find_library('libSDL2_gfx', dirs: cross_lib_path), c_compiler.find_library('libSDL2_ttf', dirs: cross_lib_path), - ws2_dep], + ws2_dep, gettext_dep], link_with: client_common, install: true ) @@ -2745,7 +2745,7 @@ executable('freeciv-mp-gtk3', c_args: [ '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_20', '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_22'], include_directories: tool_inc, - dependencies: [gtk322_dep, sqlite3_dep], + dependencies: [gtk322_dep, sqlite3_dep, gettext_dep], link_with: [common_lib, fcmp_common], install: true ) @@ -2764,7 +2764,7 @@ executable('freeciv-mp-gtk4', c_args: [ '-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_4_0', '-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_0'], include_directories: tool_inc, - dependencies: [gtk4_dep, sqlite3_dep], + dependencies: [gtk4_dep, sqlite3_dep, gettext_dep], link_with: [common_lib, fcmp_common], install: true ) @@ -2788,7 +2788,7 @@ executable('freeciv-mp-qt', 'tools/fcmp/mpgui_qt_worker.cpp', mocced_fcmp, include_directories: tool_inc, - dependencies: [qt5_dep, sqlite3_dep], + dependencies: [qt5_dep, sqlite3_dep, gettext_dep], link_with: [common_lib, fcmp_common], install: true ) @@ -2800,7 +2800,7 @@ if get_option('fcmp').contains('cli') executable('freeciv-mp-cli', 'tools/fcmp/mpcli.c', include_directories: tool_inc, - dependencies: [sqlite3_dep], + dependencies: [sqlite3_dep, gettext_dep], link_with: [common_lib, fcmp_common], install: true ) -- 2.33.0