Author: cazfi Date: Sat May 13 14:30:55 2017 New Revision: 35549 URL: http://svn.gna.org/viewcvs/freeciv?rev=35549&view=rev Log: Update msys2 environment to 170422 level
See hrm Task #652797 Modified: trunk/doc/README.msys2 trunk/windows/installer_msys2/Makefile Modified: trunk/doc/README.msys2 URL: http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.msys2?rev=35549&r1=35548&r2=35549&view=diff ============================================================================== --- trunk/doc/README.msys2 (original) +++ trunk/doc/README.msys2 Sat May 13 14:30:55 2017 @@ -56,10 +56,11 @@ - tar -2.1.1.3) Arch independent packages needed for building freeciv from svn checkout - These are needed in addition to the ones always needed for building freeciv. +2.1.1.3) Arch independent packages needed for building freeciv from repository + checkout. These are needed in addition to the ones always needed for building + freeciv. - - subversion + - git - automake - libtool - autoconf @@ -107,9 +108,9 @@ win64 host: ----------- -msys2-freeciv-win64-170126.7z, based on +msys2-freeciv-win64-170422.7z, based on https://sourceforge.net/projects/msys2/files/Base/x86-64/msys2-x86_64-20161025.exe -with packages updated to 26-Jan-17 level. +with packages updated to 22-Apr-17 level. Only win64 target is included - replace <arch> with 'x86_64' in package names below @@ -118,7 +119,7 @@ - make - pkg-config - tar -- subversion +- git - patch - nano - automake Modified: trunk/windows/installer_msys2/Makefile URL: http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/Makefile?rev=35549&r1=35548&r2=35549&view=diff ============================================================================== --- trunk/windows/installer_msys2/Makefile (original) +++ trunk/windows/installer_msys2/Makefile Sat May 13 14:30:55 2017 @@ -221,7 +221,8 @@ libepoxy-0.dll \ libgraphite2.dll \ libpangoft2-1.0-0.dll \ - libpcre-1.dll + libpcre-1.dll \ + libunistring-2.dll install-env-default-fcmp: install-env-common cp -R $(addprefix $(DLLPATH_PREFIX), $(DEFAULT_FCMP_DLLS)) install-$(WINARCH)-$(GUI)/ @@ -245,7 +246,7 @@ SDL2_ttf.dll \ libjpeg-8.dll \ libtiff-5.dll \ - libwebp-6.dll + libwebp-7.dll install-env-sdl2: install-env-default-fcmp # add DLLs @@ -262,7 +263,8 @@ Qt5Gui.dll \ Qt5Widgets.dll \ libgraphite2.dll \ - libpcre-1.dll + libpcre-1.dll \ + libunistring-2.dll install-env-qt: install-env-common # add DLLs _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits