From 0556e87548847355deb5d0432946b0a141c1e62c Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Thu, 23 Sep 2021 04:57:23 +0300
Subject: [PATCH 2/2] CI: Enable msys2 build

Adjust required dlls in msys2 CI build to match environment.

See osdn #42897

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 windows/installer_msys2/Makefile | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile
index d40a3f1cce..39c851be70 100644
--- a/windows/installer_msys2/Makefile
+++ b/windows/installer_msys2/Makefile
@@ -36,7 +36,15 @@ else
 QT6_MOCCMD="$(MOCCMD)"
 endif
 
+ifeq ($(CI),yes)
+ICUVER=68
+LERC=
+MD4C=
+else
 ICUVER=69
+LERC=libLerc.dll
+MD4C=libmd4c.dll
+endif
 
 INSTSUB=${ARCHDIR}
 
@@ -85,7 +93,7 @@ snapshot:
 
 ci:
 	cd ../.. ; ./autogen.sh --no-configure-run
-	# make VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="--enable-gitrev --with-project-definition=../../../bootstrap/snapshot.project CFLAGS=\\\"-Werror $$CFLAGS\\\" CXXFLAGS=\\\"-Werror $$CXXFLAGS\\\"" all
+	make VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="--enable-gitrev --with-project-definition=../../../bootstrap/snapshot.project CFLAGS=\\\"-Werror $$CFLAGS\\\" CXXFLAGS=\\\"-Werror $$CXXFLAGS\\\"" all
 
 # configure Freeciv
 
@@ -322,7 +330,7 @@ SDL2_DLLS := \
 	libzstd.dll \
 	libdeflate.dll \
 	libjbig-0.dll \
-	libLerc.dll
+	${LERC}
 
 install-env-sdl2: install-env-default-fcmp
 	# add DLLs
@@ -346,7 +354,7 @@ QT5_DLLS := \
 	libbrotlicommon.dll \
 	libdouble-conversion.dll \
 	libzstd.dll \
-	libmd4c.dll
+	${MD4C}
 
 install-env-qt5: install-env-common
 	# add DLLs
@@ -425,7 +433,7 @@ RULEDIT_QT5_DLLS := \
 	libraqm-0.dll \
 	libexpat-1.dll \
 	libfribidi-0.dll \
-	libmd4c.dll
+	${MD4C}
 
 install-env-ruledit-qt5:
 	# add DLLs
-- 
2.33.0