Author: cazfi
Date: Sat Jun 25 23:05:30 2016
New Revision: 33028
URL: http://svn.gna.org/viewcvs/freeciv?rev=33028&view=rev
Log:
Updasted msys2 environment to match msys2 of 18-Jun-16.
See patch #7310
Modified:
trunk/doc/README.msys2
trunk/win32/installer_msys2/Makefile
Modified: trunk/doc/README.msys2
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.msys2?rev=33028&r1=33027&r2=33028&view=diff
==============================================================================
--- trunk/doc/README.msys2 (original)
+++ trunk/doc/README.msys2 Sat Jun 25 23:05:30 2016
@@ -68,6 +68,7 @@
- gcc
- libsqlite-devel
- libiconv-devel
+ - libreadline-devel
- pkg-config
- libbz2-devel
- libcurl-devel
@@ -91,13 +92,16 @@
2.1.2) Arch-specific packages needed for building freeciv
-2.1.2.1) For building common part
+2.1.2.1) Arch-specific packages for building common parts
- mingw-w64-i686-icu / mingw-w64-x86_64-icu
-
-2.1.2.2) For building gtk3-client
+ - mingw-w64-i686-bzip2 / mingw-w64-x64_64-bzip2
+ - mingw-w64-i686-readline / mingw-w64-x86_64-readline
+ - mingw-w64-i686-SDL2_mixer / mingw-w64-x86_64-SDL2_mixer
+
+2.1.2.2) Arch-specific packages for building gtk3-client
- mingw-w64-i686-gtk3 / mingw-w64-x86_64-gtk3
-2.1.2.3) For buildind Qt-client and/or Ruledit
+2.1.2.3) Arch-specific packages for buildind Qt-client and/or Ruledit
- mingw-w64-i686-qt5 / mingw-w64-x86_64-qt5
2.2) Packaged needed for building installer package
@@ -120,7 +124,7 @@
Premade msys2 environment is available for download from
http://download.gna.org/freeciv/packages/windows/testing/cazfi/installer_msys2/envs/
-Current version is: msys2-freeciv-160425.7z
+Current version is: msys2-freeciv-160618.7z
It's based on
https://sourceforge.net/projects/msys2/files/Base/i686/msys2-i686-20160205.exe
@@ -135,8 +139,11 @@
- libbz2-devel
- liblzma-devel
- icu-devel
+- libreadline-devel
- tar
- subversion
+- patch
+- wget
- automake
- libtool
- autoconf
@@ -145,6 +152,9 @@
- mingw-w64-i686-sqlite3
- mingw-w64-i686-gtk3
- mingw-w64-i686-nsis
+- mingw-w64-i686-bzip2
+- mingw-w64-i686-readline
+- mingw-w64-i686-SDL2_mixer
Build
Modified: trunk/win32/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/Makefile?rev=33028&r1=33027&r2=33028&view=diff
==============================================================================
--- trunk/win32/installer_msys2/Makefile (original)
+++ trunk/win32/installer_msys2/Makefile Sat Jun 25 23:05:30 2016
@@ -193,8 +193,8 @@
libxml2-2.dll \
zlib1.dll \
libwinpthread-1.dll \
- libicuuc56.dll \
- libicudt56.dll
+ libicuuc57.dll \
+ libicudt57.dll
COMMON_MSYS_DLLS := \
stdc++-6.dll \
@@ -281,9 +281,9 @@
cp -R $(addprefix $(DLLPATH_PREFIX), $(SDL2_DLLS))
install-$(WINARCH)-$(GUI)
QT_DLLS := \
- libicuin56.dll \
- libicuuc56.dll \
- libicudt56.dll \
+ libicuin57.dll \
+ libicuuc57.dll \
+ libicudt57.dll \
libpcre16-0.dll \
libharfbuzz-0.dll \
libsqlite3-0.dll \
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
