diff --git a/doc/README.msys2 b/doc/README.msys2 index ad92fc4716..794885a2dd 100644 --- a/doc/README.msys2 +++ b/doc/README.msys2 @@ -25,7 +25,7 @@ using MSYS2 from https://www.msys2.org/ 1) Install MSYS2 following the documentation on their homepage 1.1) Download - https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-x86_64-20210215.exe + https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-x86_64-20220118.exe for win64 host 1.2) Run it to install MSYS2 on build system @@ -48,7 +48,6 @@ using MSYS2 from https://www.msys2.org/ - make - gettext - - pkg-config 2.1.1.2) Arch independent packages needed for getting and extracting freeciv source tarball @@ -60,7 +59,7 @@ using MSYS2 from https://www.msys2.org/ freeciv. - git - - automake + - automake1.16 - libtool - autoconf @@ -68,6 +67,7 @@ using MSYS2 from https://www.msys2.org/ 2.1.2.1) Arch-specific packages for building common parts - mingw-w64-i686-gcc / mingw-w64-x86_64-gcc + - mingw-w64-i686-pkgconf / mingw-w64-x86_64-pkgconf - mingw-w64-i686-icu / mingw-w64-x86_64-icu - mingw-w64-i686-curl / mingw-w64-x86_64-curl - mingw-w64-i686-imagemagick / mingw-w64-x86_64-imagemagick @@ -111,31 +111,32 @@ Current version is win64 host: ----------- -msys2-freeciv-win64-210226.7z, based on -https://sourceforge.net/projects/msys2/files/Base/x86-64/msys2-x86_64-20210215.exe -with packages updated to 26-Feb-2021 level. +msys2-freeciv-win64-220309.7z, based on +https://sourceforge.net/projects/msys2/files/Base/x86-64/msys2-x86_64-20220118.exe +with packages updated to 09-Mar-2022 level. -Both win32 and win64 targets are included. For each package listed below with -in the name, actually two packages is installed; one with a name where is -replaced by 'i686' and one where is replaced by 'x86_64' +Most packages are included for both win32 and win64 targets. For each package +listed below with in the name, actually two packages are installed; +one with a name where is replaced by 'i686' and +one where is replaced by 'x86_64' Following packages have been installed: - make -- pkg-config - tar - git - patch -- nano -- automake +- automake1.16 - libtool - autoconf - gdb - mingw-w64--gcc +- mingw-w64--pkgconf - mingw-w64--icu - mingw-w64--curl - mingw-w64--sqlite3 - mingw-w64--gtk3 +- mingw-w64--gtk4 - mingw-w64--nsis - mingw-w64--SDL2_mixer - mingw-w64--SDL2_image @@ -146,6 +147,7 @@ Following packages have been installed: - mingw-w64--drmingw - mingw-w64--meson - mingw-w64--tolua +- minww-w64-x86_64-qt6-base After all the packages were installed 'pacman -Scc' was run to completely empty the package cache for having smaller environment package. diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index 90a2892ac2..46f4f3172c 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -30,7 +30,7 @@ ifeq ($(MAKE_PARAMS),) MAKE_PARAMS="-j$(shell nproc)" endif -ICUVER=68 +ICUVER=69 INSTSUB=${ARCHDIR} @@ -150,14 +150,14 @@ install-ruledit: configure-freeciv-ruledit install-ruledit-dir SOUND_DLLS := \ SDL2.dll \ SDL2_mixer.dll \ - libFLAC-8.dll \ - libfluidsynth-2.dll \ + libFLAC.dll \ + libfluidsynth-3.dll \ libmodplug-1.dll \ libvorbis-0.dll \ libvorbisenc-2.dll \ libvorbisfile-3.dll \ libogg-0.dll \ - libportaudio-2.dll \ + libportaudio.dll \ libsndfile-1.dll \ libmpg123-0.dll \ libopusfile-0.dll \ @@ -287,7 +287,9 @@ SDL2_DLLS := \ libtiff-5.dll \ libwebp-7.dll \ libzstd.dll \ - libdeflate.dll + libdeflate.dll \ + libjbig-0.dll \ + libLerc.dll install-env-sdl2: install-env-default-fcmp # add DLLs @@ -310,7 +312,8 @@ QT_DLLS := \ libbrotlidec.dll \ libbrotlicommon.dll \ libdouble-conversion.dll \ - libzstd.dll + libzstd.dll \ + libmd4c.dll install-env-qt: install-env-common # add DLLs @@ -367,7 +370,8 @@ RULEDIT_DLLS := \ libltdl-7.dll \ libraqm-0.dll \ libexpat-1.dll \ - libfribidi-0.dll + libfribidi-0.dll \ + libmd4c.dll install-env-ruledit: # add DLLs