Author: cazfi
Date: Tue May 10 01:26:18 2016
New Revision: 32640
URL: http://svn.gna.org/viewcvs/freeciv?rev=32640&view=rev
Log:
Add "-msys2" to version label of msys2 builds.
See patch #7198
Modified:
trunk/win32/installer_msys2/Makefile
Modified: trunk/win32/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/Makefile?rev=32640&r1=32639&r2=32640&view=diff
==============================================================================
--- trunk/win32/installer_msys2/Makefile (original)
+++ trunk/win32/installer_msys2/Makefile Tue May 10 01:26:18 2016
@@ -73,7 +73,7 @@
# create build directory
mkdir -p build-$(WINARCH)-$(GUI)
# configure
- cd build-$(WINARCH)-$(GUI); ../../../configure
CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --enable-client=$(GUI)
--with-followtag="win32-S3_0" --without-readline --disable-sdl-mixer
--disable-nls --without-libbz2 --enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
+ cd build-$(WINARCH)-$(GUI); ../../../configure
FREECIV_LABEL_FORCE="<base>-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)"
--enable-client=$(GUI) --with-followtag="win32-S3_0" --without-readline
--disable-sdl-mixer --disable-nls --without-libbz2 --enable-fcmp=$(FCMP)
$(EXTRA_CONFIG)
# make
make -C build-$(WINARCH)-$(GUI)
make -C build-$(WINARCH)-$(GUI)/translations/core update-po
@@ -83,7 +83,7 @@
# create build directory
mkdir -p build-$(WINARCH)-ruledit
# configure
- cd build-$(WINARCH)-ruledit; ../../../configure
CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --disable-client --disable-server
--disable-fcmp --disable-freeciv-manual --enable-ruledit
--with-qt5-includes=$(ARCHDIR)/include --with-qt5-libs=$(ARCHDIR)/lib
+ cd build-$(WINARCH)-ruledit; ../../../configure
FREECIV_LABEL_FORCE="<base>-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)"
--disable-client --disable-server --disable-fcmp --disable-freeciv-manual
--enable-ruledit --with-qt5-includes=$(ARCHDIR)/include
--with-qt5-libs=$(ARCHDIR)/lib
# make
make -C build-$(WINARCH)-ruledit
make -C build-$(WINARCH)-ruledit/translations/ruledit update-po
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
