Author: cazfi
Date: Sun Oct 30 09:23:03 2016
New Revision: 34291

URL: http://svn.gna.org/viewcvs/freeciv?rev=34291&view=rev
Log:
Added Qt-client installer build to msys2 Makefile.

See patch #7888

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=34291&r1=34290&r2=34291&view=diff
==============================================================================
--- trunk/doc/README.msys2      (original)
+++ trunk/doc/README.msys2      Sun Oct 30 09:23:03 2016
@@ -12,8 +12,7 @@
 - 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 supports only gtk3-, gtk3x-, and
-    sdl2-client builds
+  - Official pre-made msys2 environment does not support gtk2-client
 
 
  Setup

Modified: trunk/windows/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/Makefile?rev=34291&r1=34290&r2=34291&view=diff
==============================================================================
--- trunk/windows/installer_msys2/Makefile      (original)
+++ trunk/windows/installer_msys2/Makefile      Sun Oct 30 09:23:03 2016
@@ -34,16 +34,16 @@
 #
 
 # by default build all installers that are buildable with current msys2 
environment
-# gtk2-installer and qt-installers are not built.
-all: gtk3-installer gtk3x-installer sdl2-installer ruledit-installer
+# gtk2-installer is not built.
+all: gtk3-installer gtk3x-installer sdl2-installer ruledit-installer 
qt-installer
 
 gtk3x-installer:
        make GUI=gtk3.22 FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit 
$(EXTRA_CONFIG)" wrap-gtk3x
 
 # These are what can be built in current official environment version
-buildable-win32: gtk3-installer gtk3x-installer sdl2-installer 
ruledit-installer
-
-buildable-win64: gtk3-installer gtk3x-installer sdl2-installer 
ruledit-installer
+buildable-win32: gtk3-installer gtk3x-installer sdl2-installer 
ruledit-installer qt-installer
+
+buildable-win64: gtk3-installer gtk3x-installer sdl2-installer 
ruledit-installer qt-installer
 
 # See comments on 'snapshot' target why this wrapping is needed
 buildable: buildable-$(WINARCH)


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

Reply via email to