Author: cazfi
Date: Fri Feb 12 12:17:45 2016
New Revision: 31897

URL: http://svn.gna.org/viewcvs/freeciv?rev=31897&view=rev
Log:
Enable ruledit explicitly in configure for Ruledit Installer build, so it
gives a hard failure in that phase already instead of just leaving ruledit out.

See patch #6943

Modified:
    trunk/win32/installer/Makefile
    trunk/win32/installer_msys2/Makefile

Modified: trunk/win32/installer/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer/Makefile?rev=31897&r1=31896&r2=31897&view=diff
==============================================================================
--- trunk/win32/installer/Makefile      (original)
+++ trunk/win32/installer/Makefile      Fri Feb 12 12:17:45 2016
@@ -64,7 +64,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
+       cd build-ruledit; ../../../configure CPPFLAGS="-D_WIN32_WINNT=0x0600" 
--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=31897&r1=31896&r2=31897&view=diff
==============================================================================
--- trunk/win32/installer_msys2/Makefile        (original)
+++ trunk/win32/installer_msys2/Makefile        Fri Feb 12 12:17:45 2016
@@ -62,7 +62,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 --with-qt5-includes=$(ARCHDIR)/include 
--with-qt5-libs=$(ARCHDIR)/lib
+       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
        # 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

Reply via email to