From 5123bcc005776c227279d4a023f29bca9f99d04c Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 15 Jan 2022 20:54:02 +0200 Subject: [PATCH 48/48] Meson: Use correct path separators on Windows See osdn #43578 Signed-off-by: Marko Lindqvist --- meson.build | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/meson.build b/meson.build index 9878fda5bb..a1ab26135e 100644 --- a/meson.build +++ b/meson.build @@ -23,14 +23,6 @@ priv_conf_data.set('LOCALEDIR', priv_conf_data.set('BINDIR', join_paths(get_option('prefix'), get_option('bindir'))) -if host_system == 'windows' - priv_conf_data.set('FREECIV_STORAGE_DIR', '~\\\\.freeciv') - pub_conf_data.set('FREECIV_STORAGE_DIR', '~\\\\.freeciv') -else - priv_conf_data.set('FREECIV_STORAGE_DIR', '~/.freeciv') - pub_conf_data.set('FREECIV_STORAGE_DIR', '~/.freeciv') -endif - priv_conf_data.set('DATADIR', join_paths(get_option('prefix'), get_option('datadir'))) priv_conf_data.set('DATASUBDIR', 'dev') @@ -52,12 +44,27 @@ 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 host_system == 'windows' + priv_conf_data.set('FREECIV_STORAGE_DIR', '~\\\\.freeciv') + pub_conf_data.set('FREECIV_STORAGE_DIR', '~\\\\.freeciv') + + 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"') +else + priv_conf_data.set('FREECIV_STORAGE_DIR', '~/.freeciv') + pub_conf_data.set('FREECIV_STORAGE_DIR', '~/.freeciv') + + 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"') +endif if get_option('freeciv-web') priv_conf_data.set('FREECIV_WEB', 1) -- 2.34.1