From c2510a8f5cde679699fb578e6cb32d962d3c6686 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 8 Sep 2021 07:04:28 +0300 Subject: [PATCH 10/10] Msys2 Makefile: Handle icu version with a single variable See osdn: #42835 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index aed6380809..b5a892a1c6 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -30,6 +30,8 @@ ifeq ($(MAKE_PARAMS),) MAKE_PARAMS="-j$(shell nproc)" endif +ICUVER=68 + INSTSUB=${ARCHDIR} # msys2 has dlls in... @@ -199,8 +201,8 @@ COMMON_DLLS := \ libxml2-2.dll \ zlib1.dll \ libwinpthread-1.dll \ - libicuuc68.dll \ - libicudt68.dll \ + libicuuc${ICUVER}.dll \ + libicudt${ICUVER}.dll \ libsqlite3-0.dll \ exchndl.dll \ mgwhelp.dll \ @@ -292,9 +294,9 @@ install-env-sdl2: install-env-default-fcmp cp -R $(addprefix $(DLLPATH_PREFIX), $(SDL2_DLLS)) install-$(WINARCH)-$(GUI)/ QT_DLLS := \ - libicuin68.dll \ - libicuuc68.dll \ - libicudt68.dll \ + libicuin${ICUVER}.dll \ + libicuuc${ICUVER}.dll \ + libicudt${ICUVER}.dll \ libpcre16-0.dll \ libharfbuzz-0.dll \ libsqlite3-0.dll \ -- 2.33.0