Author: cazfi
Date: Fri Aug 19 09:49:56 2016
New Revision: 33645

URL: http://svn.gna.org/viewcvs/freeciv?rev=33645&view=rev
Log:
Fixed building of msys2 based gtk2-client Installer for Windows.

See patch #7621

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=33645&r1=33644&r2=33645&view=diff
==============================================================================
--- branches/S2_6/doc/README.msys2      (original)
+++ branches/S2_6/doc/README.msys2      Fri Aug 19 09:49:56 2016
@@ -13,9 +13,9 @@
   build method
 - With very specific configure options (see Problems) and msys2 package
   selection freeciv can be built
-- Buildable clients are gtk3 and Qt
+- Buildable clients are gtk3, gtk2, and Qt
 - Audio support cannot be built in
-- Both server and gtk3-client launch ok, Qt client does not
+- Both server, gtk3-client, and gtk2-client launch ok, Qt client does not
 - Most Installers cannot be built
 - Buildable Installers:
   - Ruledit
@@ -103,6 +103,9 @@
 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.2) Packaged needed for building installer package
  These are needed in addition to above ones used in the
  building step already.
@@ -114,7 +117,7 @@
 
 2.3) Packages TODO:
  - Mixer support
- - Clients other than gtk3
+ - Clients other than gtk3 and gtk2
  - MagickWand support
 
 
@@ -183,6 +186,7 @@
   Target can be:
   - "<gui>-installer", where <gui> is
      - gtk3
+     - gtk2
      - qt
   - "ruledit-installer"
   - "snapshot", if your freeciv sources are in svn checkout directory

Modified: branches/S2_6/win32/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=33645&r1=33644&r2=33645&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/Makefile        (original)
+++ branches/S2_6/win32/installer_msys2/Makefile        Fri Aug 19 09:49:56 2016
@@ -246,16 +246,20 @@
 
 GTK2_DLLS := \
        libgdk-win32-2.0-0.dll \
-       libgtk-win32-2.0-0.dll
+       libgtk-win32-2.0-0.dll \
+       libexpat-1.dll \
+       libharfbuzz-0.dll \
+       libpangoft2-1.0-0.dll \
+       libpcre-1.dll
 
 install-env-gtk2: install-env-common
        # add DLLs
        cp -R $(addprefix $(DLLPATH_PREFIX), $(GTK2_DLLS)) 
install-$(WINARCH)-$(GUI)/
        # add additional GTK+2 files
        mkdir -p install-$(WINARCH)-$(GUI)/etc
-       cp -R /etc/gtk-2.0 install-$(WINARCH)-$(GUI)/etc/
+       cp -R /$(ARCHDIR)/etc/gtk-2.0 install-$(WINARCH)-$(GUI)/etc/
        mkdir -p install-$(WINARCH)-$(GUI)/lib/gtk-2.0/
-       cp -R /lib/gtk-2.0/2.10.0 install-$(WINARCH)-$(GUI)/lib/gtk-2.0/
+       cp -R /$(ARCHDIR)/lib/gtk-2.0/2.10.0 
install-$(WINARCH)-$(GUI)/lib/gtk-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 gtk20.mo -delete
 


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to