Author: cazfi
Date: Mon Aug 8 02:23:08 2016
New Revision: 33507
URL: http://svn.gna.org/viewcvs/freeciv?rev=33507&view=rev
Log:
Changed windows build followtag from "win32-S3_0" to "windows-S3_0"
See patch #7557
Modified:
trunk/translations/Strings.txt
trunk/windows/installer/Makefile
trunk/windows/installer_msys2/Makefile
Modified: trunk/translations/Strings.txt
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/translations/Strings.txt?rev=33507&r1=33506&r2=33507&view=diff
==============================================================================
--- trunk/translations/Strings.txt (original)
+++ trunk/translations/Strings.txt Mon Aug 8 02:23:08 2016
@@ -10,12 +10,13 @@
/* TRANS: Version tag name received from metaserver */
_("?vertag:stable")
+_("?vertag:windows")
_("?vertag:win32")
_("?vertag:S2_6")
_("?vertag:S3_0")
_("?vertag:crosser")
_("?vertag:win32-S2_6")
-_("?vertag:win32-S3_0")
+_("?vertag:windows-S3_0")
Generated version header
Modified: trunk/windows/installer/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer/Makefile?rev=33507&r1=33506&r2=33507&view=diff
==============================================================================
--- trunk/windows/installer/Makefile (original)
+++ trunk/windows/installer/Makefile Mon Aug 8 02:23:08 2016
@@ -61,7 +61,7 @@
# create build directory
mkdir -p build-$(GUI)
# configure
- cd build-$(GUI); ../../../configure
CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --enable-client=$(GUI)
--with-followtag="win32-S3_0" --enable-fcdb=sqlite3 --enable-fcmp=$(FCMP)
$(EXTRA_CONFIG)
+ cd build-$(GUI); ../../../configure
CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --enable-client=$(GUI)
--with-followtag="windows-S3_0" --enable-fcdb=sqlite3 --enable-fcmp=$(FCMP)
$(EXTRA_CONFIG)
# make
make -C build-$(GUI)
make -C build-$(GUI)/translations/core update-po
Modified: trunk/windows/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/Makefile?rev=33507&r1=33506&r2=33507&view=diff
==============================================================================
--- trunk/windows/installer_msys2/Makefile (original)
+++ trunk/windows/installer_msys2/Makefile Mon Aug 8 02:23:08 2016
@@ -75,7 +75,7 @@
# create build directory
mkdir -p build-$(WINARCH)-$(GUI)
# configure
- cd build-$(WINARCH)-$(GUI); ../../../configure
FREECIV_LABEL_FORCE="<base>-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)"
--with-project-definition=../../../bootstrap/snapshot.project
--enable-client=$(GUI) --with-followtag="win32-S3_0" --without-readline
--disable-sdl-mixer --without-libbz2 --enable-fcdb=sqlite3
--enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
+ cd build-$(WINARCH)-$(GUI); ../../../configure
FREECIV_LABEL_FORCE="<base>-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)"
--with-project-definition=../../../bootstrap/snapshot.project
--enable-client=$(GUI) --with-followtag="windows-S3_0" --without-readline
--disable-sdl-mixer --without-libbz2 --enable-fcdb=sqlite3
--enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
# make
make -C build-$(WINARCH)-$(GUI)
make -C build-$(WINARCH)-$(GUI)/translations/core update-po
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
