Author: cazfi
Date: Mon Nov 14 11:16:27 2016
New Revision: 34509
URL: http://svn.gna.org/viewcvs/freeciv?rev=34509&view=rev
Log:
Replace gtk3x by gtk3.22 in msys2 make target names.
See patch #7980
Modified:
trunk/windows/installer_msys2/Makefile
Modified: trunk/windows/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/Makefile?rev=34509&r1=34508&r2=34509&view=diff
==============================================================================
--- trunk/windows/installer_msys2/Makefile (original)
+++ trunk/windows/installer_msys2/Makefile Mon Nov 14 11:16:27 2016
@@ -35,15 +35,15 @@
# by default build all installers that are buildable with current msys2
environment
# 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
+all: gtk3-installer gtk3.22-installer sdl2-installer ruledit-installer
qt-installer
+
+gtk3.22-installer:
+ make GUI=gtk3.22 FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit
$(EXTRA_CONFIG)" wrap-gtk3.22
# These are what can be built in current official environment version
-buildable-win32: gtk3-installer gtk3x-installer sdl2-installer
ruledit-installer qt-installer
-
-buildable-win64: gtk3-installer gtk3x-installer sdl2-installer
ruledit-installer qt-installer
+buildable-win32: gtk3-installer gtk3.22-installer sdl2-installer
ruledit-installer qt-installer
+
+buildable-win64: gtk3-installer gtk3.22-installer sdl2-installer
ruledit-installer qt-installer
# See comments on 'snapshot' target why this wrapping is needed
buildable: buildable-$(WINARCH)
@@ -94,7 +94,7 @@
make -C build-$(WINARCH)-ruledit/translations/ruledit update-po
make -C build-$(WINARCH)-ruledit/bootstrap langstat_ruledit.txt
-build-freeciv-gtk3x: build-freeciv-common
+build-freeciv-gtk3.22: build-freeciv-common
build-freeciv-gtk3: build-freeciv-common
@@ -375,7 +375,7 @@
mkdir -p Output
makensis Freeciv-$(WINARCH)-$(FREECIV_VERSION)-ruledit.nsi
-wrap-gtk3x: build-freeciv-gtk3x installer-common
+wrap-gtk3.22: build-freeciv-gtk3.22 installer-common
wrap-gtk3: build-freeciv-gtk3 installer-common
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
