Author: cazfi
Date: Fri Apr 15 15:41:00 2016
New Revision: 32410
URL: http://svn.gna.org/viewcvs/freeciv?rev=32410&view=rev
Log:
Added support for configurable minimum Windows version in Installer build
Makefile
See patch #7103
Modified:
trunk/doc/README.msys2
trunk/win32/installer/Makefile
trunk/win32/installer_msys2/Makefile
Modified: trunk/doc/README.msys2
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.msys2?rev=32410&r1=32409&r2=32410&view=diff
==============================================================================
--- trunk/doc/README.msys2 (original)
+++ trunk/doc/README.msys2 Fri Apr 15 15:41:00 2016
@@ -112,6 +112,14 @@
- Clients other than gtk3
- MagickWand support
+ You can also set minimum Windows version targeted. While setting this
+ to an older version allows those Windows versions to run the created
+ executables, it may come with the cost of disabling functionality that
+ newer Windows versions could otherwise have.
+ The version is set via MIN_WIN_VER variable. For values to use, see
+ list in: https://msdn.microsoft.com/en-us/library/6sehtctf.aspx
+ Current default is 0x0600 (Vista).
+
Build
====================================
Modified: trunk/win32/installer/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer/Makefile?rev=32410&r1=32409&r2=32410&view=diff
==============================================================================
--- trunk/win32/installer/Makefile (original)
+++ trunk/win32/installer/Makefile Fri Apr 15 15:41:00 2016
@@ -19,6 +19,13 @@
# 7. find the installer executables in the 'Output' directory
#
+#
+# Variable setup
+#
+
+ifeq ($(MIN_WIN_VER),)
+MIN_WIN_VER=0x0600
+endif
#
# Make rules
@@ -54,7 +61,7 @@
# create build directory
mkdir -p build-$(GUI)
# configure
- cd build-$(GUI); ../../../configure CPPFLAGS="-D_WIN32_WINNT=0x0600"
--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="win32-S3_0" --enable-fcdb=sqlite3 --enable-fcmp=$(FCMP)
$(EXTRA_CONFIG)
# make
make -C build-$(GUI)
make -C build-$(GUI)/translations/core update-po
@@ -64,7 +71,7 @@
# create build directory
mkdir -p build-ruledit
# configure
- cd build-ruledit; ../../../configure CPPFLAGS="-D_WIN32_WINNT=0x0600"
--disable-client --disable-server --disable-fcmp --disable-freeciv-manual
--enable-ruledit
+ cd build-ruledit; ../../../configure
CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --disable-client --disable-server
--disable-fcmp --disable-freeciv-manual --enable-ruledit
# make
make -C build-ruledit
make -C build-ruledit/translations/ruledit update-po
Modified: trunk/win32/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/Makefile?rev=32410&r1=32409&r2=32410&view=diff
==============================================================================
--- trunk/win32/installer_msys2/Makefile (original)
+++ trunk/win32/installer_msys2/Makefile Fri Apr 15 15:41:00 2016
@@ -18,6 +18,10 @@
GCCDLL=libgcc_s_dw2-1.dll
endif
+ifeq ($(MIN_WIN_VER),)
+MIN_WIN_VER=0x0600
+endif
+
# msys2 has dlls in...
DLLPATH_PREFIX=$(ARCHDIR)/bin/
@@ -68,7 +72,7 @@
# create build directory
mkdir -p build-$(WINARCH)-$(GUI)
# configure
- cd build-$(WINARCH)-$(GUI); ../../../configure
CPPFLAGS="-D_WIN32_WINNT=0x0600" --enable-client=$(GUI)
--with-followtag="win32-S3_0" --enable-fcdb=sqlite3 --without-readline
--disable-sdl-mixer --disable-nls --enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
+ cd build-$(WINARCH)-$(GUI); ../../../configure
CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --enable-client=$(GUI)
--with-followtag="win32-S3_0" --enable-fcdb=sqlite3 --without-readline
--disable-sdl-mixer --disable-nls --enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
# make
make -C build-$(WINARCH)-$(GUI)
make -C build-$(WINARCH)-$(GUI)/translations/core update-po
@@ -78,7 +82,7 @@
# create build directory
mkdir -p build-$(WINARCH)-ruledit
# configure
- cd build-$(WINARCH)-ruledit; ../../../configure
CPPFLAGS="-D_WIN32_WINNT=0x0600" --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
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
