From 5049a67a468a3c11155c5e96728541a8b8c1bc02 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 25 Mar 2022 18:33:10 +0200 Subject: [PATCH 42/42] Msys2 Makefile: Handle ImageMagick version with a variable Now on we need to update ImageMagick version in the variable only, not in every file name it's part of. See osdn #44184 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index c2ed32045b..3e50f057ac 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -37,6 +37,7 @@ QT6_MOCCMD="$(MOCCMD)" endif ICUVER=69 +MAGICKVER=7.Q16HDRI-7 INSTSUB=${ARCHDIR} @@ -285,8 +286,8 @@ COMMON_DLLS := \ libtermcap-0.dll \ libssp-0.dll \ libzstd.dll \ - libMagickWand-7.Q16HDRI-7.dll \ - libMagickCore-7.Q16HDRI-7.dll \ + libMagickWand-${MAGICKVER}.dll \ + libMagickCore-${MAGICKVER}.dll \ libgomp-1.dll \ libfftw3-3.dll \ liblcms2-2.dll \ @@ -461,8 +462,8 @@ RULEDIT_QT5_DLLS := \ libpcre-1.dll \ libdouble-conversion.dll \ libzstd.dll \ - libMagickWand-7.Q16HDRI-7.dll \ - libMagickCore-7.Q16HDRI-7.dll \ + libMagickWand-${MAGICKVER}.dll \ + libMagickCore-${MAGICKVER}.dll \ libgomp-1.dll \ libfftw3-3.dll \ liblcms2-2.dll \ @@ -520,8 +521,8 @@ RULEDIT_QT6_DLLS := \ libpcre-1.dll \ libdouble-conversion.dll \ libzstd.dll \ - libMagickWand-7.Q16HDRI-7.dll \ - libMagickCore-7.Q16HDRI-7.dll \ + libMagickWand-${MAGICKVER}.dll \ + libMagickCore-${MAGICKVER}.dll \ libgomp-1.dll \ libfftw3-3.dll \ liblcms2-2.dll \ -- 2.35.1