From f992b00231b249ec14a5391961deaa6c186f8e5c Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 8 Sep 2021 07:01:14 +0300 Subject: [PATCH 31/31] Msys2 Makefile: Handle icu version with a single variable See osdn: #42835 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index c03979f1d8..d40a3f1cce 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -36,6 +36,8 @@ else QT6_MOCCMD="$(MOCCMD)" endif +ICUVER=69 + INSTSUB=${ARCHDIR} # msys2 has dlls in... @@ -251,8 +253,8 @@ COMMON_DLLS := \ libxml2-2.dll \ zlib1.dll \ libwinpthread-1.dll \ - libicuuc69.dll \ - libicudt69.dll \ + libicuuc${ICUVER}.dll \ + libicudt${ICUVER}.dll \ libsqlite3-0.dll \ exchndl.dll \ mgwhelp.dll \ @@ -327,9 +329,9 @@ install-env-sdl2: install-env-default-fcmp cp -R $(addprefix $(DLLPATH_PREFIX), $(SDL2_DLLS)) install-$(WINARCH)-$(GUI)/ QT5_DLLS := \ - libicuin69.dll \ - libicuuc69.dll \ - libicudt69.dll \ + libicuin${ICUVER}.dll \ + libicuuc${ICUVER}.dll \ + libicudt${ICUVER}.dll \ libpcre16-0.dll \ libharfbuzz-0.dll \ libsqlite3-0.dll \ @@ -355,9 +357,9 @@ install-env-qt5: install-env-common find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name "freeciv*.mo" -delete QT6_DLLS := \ - libicuin69.dll \ - libicuuc69.dll \ - libicudt69.dll \ + libicuin${ICUVER}.dll \ + libicuuc${ICUVER}.dll \ + libicudt${ICUVER}.dll \ Qt6Core.dll \ Qt6Gui.dll \ Qt6Widgets.dll \ -- 2.33.0