From e9523d7787a84e72f298d39bf06548ca45876bec Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 2 Jun 2021 06:53:57 +0300 Subject: [PATCH 50/50] Meson: Set data paths from meson.build Replace FREECIV_DATA_PATH & friends #defines in meson_fc_config.h.in with #mesondefines. See osdn #42454 Signed-off-by: Marko Lindqvist --- gen_headers/meson_fc_config.h.in | 6 +++--- meson.build | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gen_headers/meson_fc_config.h.in b/gen_headers/meson_fc_config.h.in index a24c782e9a..d38ed39edc 100644 --- a/gen_headers/meson_fc_config.h.in +++ b/gen_headers/meson_fc_config.h.in @@ -25,9 +25,9 @@ #define INIT_BRACE_BEGIN { #define INIT_BRACE_END } -#define DEFAULT_DATA_PATH ".:data:@FREECIV_STORAGE_DIR@/" DATASUBDIR ":@DATADIR@/freeciv" -#define DEFAULT_SAVE_PATH ".:@FREECIV_STORAGE_DIR@/saves" -#define DEFAULT_SCENARIO_PATH ".:data/scenarios:@FREECIV_STORAGE_DIR@/" DATASUBDIR "/scenarios:@FREECIV_STORAGE_DIR@/scenarios:@DATADIR@/freeciv/scenarios" +#mesondefine DEFAULT_DATA_PATH +#mesondefine DEFAULT_SAVE_PATH +#mesondefine DEFAULT_SCENARIO_PATH #define MPICON_PATH "@DATADIR@/freeciv/misc/mpicon.png" diff --git a/meson.build b/meson.build index 413d7d199f..39e67f73ff 100644 --- a/meson.build +++ b/meson.build @@ -48,6 +48,13 @@ else add_global_arguments('-DQT_NO_DEBUG', language : 'cpp') endif +priv_conf_data.set('DEFAULT_DATA_PATH', + '".:data:@FREECIV_STORAGE_DIR@/@DATASUBDIR@:@DATADIR@/freeciv"') +priv_conf_data.set('DEFAULT_SAVE_PATH', + '".:@FREECIV_STORAGE_DIR@/saves"') +priv_conf_data.set('DEFAULT_SCENARIO_PATH', + '".:data/scenarios:@FREECIV_STORAGE_DIR@/@DATASUBDIR@/scenarios:@FREECIV_STORAGE_DIR@/scenarios:@DATADIR@/freeciv/scenarios"') + if get_option('freeciv-web') priv_conf_data.set('FREECIV_WEB', 1) server_binary_name = 'freeciv-web' -- 2.30.2