From 7478b1544bdf48702f1812b069270c2102276be1 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 19 Feb 2022 04:09:06 +0200 Subject: [PATCH 44/44] Meson: Generate version_gen.h before using it See osdn #43918 Signed-off-by: Marko Lindqvist --- meson.build | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index bff624f882..d6633a1e9d 100644 --- a/meson.build +++ b/meson.build @@ -502,7 +502,7 @@ fc_deps = static_library('fc_dependencies', 'dependencies/luasql/src/luasql.c', 'dependencies/luasql/src/ls_sqlite3.c', tinycthr_files, - sources: verhdr, + sources: [verhdr], include_directories : common_inc, dependencies: lua_dep ) @@ -732,8 +732,8 @@ ais = static_library('fc_ai', 'ai/default/daimilitary.c', 'ai/default/daiplayer.c', 'ai/default/daisettler.c', - include_directories: [server_inc, include_directories('ai/default')], - sources: [verhdr] + sources: [verhdr], + include_directories: [server_inc, include_directories('ai/default')] ) server_lib = static_library('fc_server', @@ -2818,6 +2818,7 @@ fcmp_common = static_library('fcmp_common', 'tools/fcmp/modinst.c', 'tools/fcmp/mpcmdline.c', 'tools/fcmp/mpdb.c', + sources: [verhdr], include_directories: tool_inc ) @@ -2832,6 +2833,7 @@ 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', @@ -2907,7 +2909,8 @@ tool_lib = static_library('fc_toolutil', 'tools/ruleutil/comments.c', 'tools/ruleutil/rulesave.c', 'tools/shared/tools_fc_interface.c', - include_directories: server_inc + sources: [verhdr], + include_directories: server_inc, ) executable('freeciv-ruleup', -- 2.34.1