Author: cazfi
Date: Sat May 13 14:31:09 2017
New Revision: 35551
URL: http://svn.gna.org/viewcvs/freeciv?rev=35551&view=rev
Log:
Update msys2 environment to 170422 level
See hrm Task #652797
Modified:
branches/S2_6/doc/README.msys2
branches/S2_6/win32/installer_msys2/Makefile
Modified: branches/S2_6/doc/README.msys2
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README.msys2?rev=35551&r1=35550&r2=35551&view=diff
==============================================================================
--- branches/S2_6/doc/README.msys2 (original)
+++ branches/S2_6/doc/README.msys2 Sat May 13 14:31:09 2017
@@ -59,10 +59,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
@@ -112,9 +113,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
@@ -123,7 +124,7 @@
- make
- pkg-config
- tar
-- subversion
+- git
- patch
- nano
- automake
Modified: branches/S2_6/win32/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=35551&r1=35550&r2=35551&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/Makefile (original)
+++ branches/S2_6/win32/installer_msys2/Makefile Sat May 13 14:31:09 2017
@@ -232,7 +232,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)/
@@ -277,7 +278,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
@@ -294,7 +295,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
