Author: cazfi
Date: Wed Feb 1 09:38:22 2017
New Revision: 34916
URL: http://svn.gna.org/viewcvs/freeciv?rev=34916&view=rev
Log:
Updated msys2 environment to 170126 level.
See patch #8085
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=34916&r1=34915&r2=34916&view=diff
==============================================================================
--- trunk/doc/README.msys2 (original)
+++ trunk/doc/README.msys2 Wed Feb 1 09:38:22 2017
@@ -9,10 +9,7 @@
Status
====================================
-- Msys1, not msys2, is still the official freeciv Windows Installer
- build method
-- Buildable clients are gtk3, gtk2, sdl2, and Qt
- - Official pre-made msys2 environment does not support gtk2-client
+- Buildable clients are gtk3, gtk3.22, sdl2, and Qt
Setup
@@ -27,9 +24,9 @@
1) Install MSYS2 following the documentation on their homepage
1.1) Download
- https://sourceforge.net/projects/msys2/files/Base/i686/msys2-i686-20160205.exe
+ https://sourceforge.net/projects/msys2/files/Base/i686/msys2-i686-20161025.exe
for win32 or
-
https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-x86_64-20160205.exe
+
https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-x86_64-20161025.exe
for win64
1.2) Run it to install MSYS2 on build system
@@ -38,7 +35,6 @@
> pacman -Syu
2) Install following packages with 'pacman -Su'
- As of 18-Oct-16, one has to use also '--force' option.
2.1) Packages needed for building freeciv
These packages are needed even if you don't plan to make installer,
@@ -86,10 +82,7 @@
2.1.2.3) Arch-specific packages for buildind Qt-client and/or Ruledit
- mingw-w64-i686-qt5 / mingw-w64-x86_64-qt5
-2.1.2.4) Arch-specific packages for building gtk2-client
- - mingw-w64-i686-gtk2 / mingw-w64-x86_64-gtk2
-
-2.1.2.5) Arch-specific packages for building sdl2-client
+2.1.2.4) Arch-specific packages for building sdl2-client
- mingw-w64-i686-SDL2_image / mingw-w64-x86_64-SDL2_image
- mingw-w64-i686-SDL2_ttf / mingw-w64-x86_64-SDL2_ttf
- mingw-w64-i686-SDL2_gfx / mingw-w64-x86_64-SDL2_gfx
@@ -103,10 +96,6 @@
- mingw-w64-i686-nsis / mingw-w64-x86_64-nsis
-2.3) Packages TODO:
-
- - MagickWand support
-
Premade environment
====================================
@@ -118,9 +107,9 @@
win64 host:
-----------
-msys2-freeciv-win64-161212.7z, based on
-https://sourceforge.net/projects/msys2/files/Base/x86-64/msys2-x86_64-20160921.exe
-with packages updated to 12-Dec-16 level.
+msys2-freeciv-win64-170126.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.
Only win64 target is included - replace <arch> with 'x86_64' in package names
below
@@ -163,13 +152,13 @@
3) Copy them from Windows folder where they are to a directory that
is within msys2
-> cd win32/installer_msys2
+> cd windows/installer_msys2
> make <targets>
Target can be:
- "<gui>-installer", where <gui> is
- gtk3
- - gtk2
+ - gtk3.22
- sdl2
- qt
- "ruledit-installer"
Modified: trunk/windows/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/Makefile?rev=34916&r1=34915&r2=34916&view=diff
==============================================================================
--- trunk/windows/installer_msys2/Makefile (original)
+++ trunk/windows/installer_msys2/Makefile Wed Feb 1 09:38:22 2017
@@ -24,7 +24,7 @@
MIN_WIN_VER=0x0601
endif
-INSTSUB=usr/local
+INSTSUB=${ARCHDIR}
# msys2 has dlls in...
DLLPATH_PREFIX=/$(ARCHDIR)/bin/
@@ -232,6 +232,8 @@
cp -R /$(ARCHDIR)/share/icons/Adwaita
install-$(WINARCH)-$(GUI)/share/icons/
mkdir -p install-$(WINARCH)-$(GUI)/lib/gtk-3.0/
cp -R /$(ARCHDIR)/lib/gtk-3.0/* install-$(WINARCH)-$(GUI)/lib/gtk-3.0/
+ mkdir -p install-$(WINARCH)-$(GUI)/lib/gdk-pixbuf-2.0/
+ cp -R /$(ARCHDIR)/lib/gdk-pixbuf-2.0/*
install-$(WINARCH)-$(GUI)/lib/gdk-pixbuf-2.0/
cp -R /$(ARCHDIR)/share/locale install-$(WINARCH)-$(GUI)/share/
find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name
"freeciv*.mo" -and -not -name gtk30.mo -delete
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
