Author: cazfi
Date: Sun Oct 23 09:09:16 2016
New Revision: 34212
URL: http://svn.gna.org/viewcvs/freeciv?rev=34212&view=rev
Log:
Updated gtk3.22-client enabling configure option in msys2 Windows Installer
makefile.
See patch #7858
Added:
trunk/windows/installer_msys2/create-freeciv-gtk3.22-nsi.sh
- copied unchanged from r34211,
trunk/windows/installer_msys2/create-freeciv-gtk3x-nsi.sh
Removed:
trunk/windows/installer_msys2/create-freeciv-gtk3x-nsi.sh
Modified:
trunk/windows/Makefile.am
trunk/windows/installer_msys2/Makefile
Modified: trunk/windows/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/Makefile.am?rev=34212&r1=34211&r2=34212&view=diff
==============================================================================
--- trunk/windows/Makefile.am (original)
+++ trunk/windows/Makefile.am Sun Oct 23 09:09:16 2016
@@ -11,7 +11,7 @@
installer_msys2/create-freeciv-gtk-qt-nsi.sh \
installer_msys2/create-freeciv-gtk2-nsi.sh \
installer_msys2/create-freeciv-gtk3-nsi.sh \
- installer_msys2/create-freeciv-gtk3x-nsi.sh \
+ installer_msys2/create-freeciv-gtk3.22-nsi.sh \
installer_msys2/create-freeciv-qt-nsi.sh \
installer_msys2/create-freeciv-sdl2-nsi.sh \
installer_msys2/create-freeciv-ruledit-nsi.sh \
Modified: trunk/windows/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/Makefile?rev=34212&r1=34211&r2=34212&view=diff
==============================================================================
--- trunk/windows/installer_msys2/Makefile (original)
+++ trunk/windows/installer_msys2/Makefile Sun Oct 23 09:09:16 2016
@@ -38,7 +38,7 @@
all: gtk3-installer gtk3x-installer sdl2-installer ruledit-installer
gtk3x-installer:
- make GUI=gtk3x FCMP=gtk3x EXTRA_CONFIG="--disable-ruledit
$(EXTRA_CONFIG)" wrap-gtk3x
+ 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
@@ -127,7 +127,7 @@
# add start menu files
cp freeciv-server.cmd freeciv-mp-$(FCMP).cmd freeciv-$(GUI).cmd
Freeciv.url install-$(WINARCH)-$(GUI)/
-install-freeciv-gtk3x: install-freeciv-common
+install-freeciv-gtk3.22: install-freeciv-common
install-freeciv-gtk3: install-freeciv-common
@@ -250,7 +250,7 @@
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
-install-env-gtk3x: install-env-default-fcmp
+install-env-gtk3.22: install-env-default-fcmp
install-env-gtk3: install-env-default-fcmp
@@ -414,7 +414,7 @@
clean:
make GUI=gtk3 clean-build-common clean-install-common
clean-installer-common
- make GUI=gtk3x clean-build-common clean-install-common
clean-installer-common
+ make GUI=gtk3.22 clean-build-common clean-install-common
clean-installer-common
make GUI=gtk2 clean-build-common clean-install-common
clean-installer-common
make GUI=sdl2 clean-build-common clean-install-common
clean-installer-common
make GUI=qt clean-build-common clean-install-common
clean-installer-common
Removed: trunk/windows/installer_msys2/create-freeciv-gtk3x-nsi.sh
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/create-freeciv-gtk3x-nsi.sh?rev=34211&view=auto
==============================================================================
--- trunk/windows/installer_msys2/create-freeciv-gtk3x-nsi.sh (original)
+++ trunk/windows/installer_msys2/create-freeciv-gtk3x-nsi.sh (removed)
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# ./create-freeciv-gtk3x-nsi.sh <Freeciv files directory> <version>
-
-./create-freeciv-gtk-qt-nsi.sh $1 $2 "gtk3.22" "GTK+3x" $3
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
