From 50f4a7c1f7eb30bccd6bf73566847319e9812d54 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 22 Apr 2021 07:35:27 +0300 Subject: [PATCH 46/46] Meson: Define storage dir with correct dir separator in Windows See osdn #42054 Signed-off-by: Marko Lindqvist --- meson.build | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index bff32483cb..43cdbd774d 100644 --- a/meson.build +++ b/meson.build @@ -24,8 +24,14 @@ priv_conf_data.set('LOCALEDIR', priv_conf_data.set('BINDIR', join_paths(get_option('prefix'), get_option('bindir'))) -priv_conf_data.set('FREECIV_STORAGE_DIR', '~/.freeciv') -pub_conf_data.set('FREECIV_STORAGE_DIR', '~/.freeciv') +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') -- 2.30.2