Author: cazfi
Date: Fri Sep  9 14:33:09 2016
New Revision: 33769

URL: http://svn.gna.org/viewcvs/freeciv?rev=33769&view=rev
Log:
Added libbz2 support to msys2 based Windows Installer builds.

See patch #7674

Modified:
    branches/S2_6/doc/README.msys2
    branches/S2_6/win32/installer_msys2/Makefile

Modified: branches/S2_6/doc/README.msys2
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README.msys2?rev=33769&r1=33768&r2=33769&view=diff
==============================================================================
--- branches/S2_6/doc/README.msys2      (original)
+++ branches/S2_6/doc/README.msys2      Fri Sep  9 14:33:09 2016
@@ -195,18 +195,10 @@
 - Freeciv linked against readline in msys2 does not work.
   Configure freeciv with --without-readline
 
-- Checking if files are bzip2 compressed crashes freeciv.
-  Disable bzip2 support with --without-libbz2
-
 
  TODO
 ====================================
 
-- Bzip2 based compression support was disabled without
-  removing any dll's from the installer packages.
-  Please review what related dlls are packaged and could be
-  removed.
-
 - Qt program installers; qt-client and ruledit
 
 - sdl2-client installer

Modified: branches/S2_6/win32/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=33769&r1=33768&r2=33769&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/Makefile        (original)
+++ branches/S2_6/win32/installer_msys2/Makefile        Fri Sep  9 14:33:09 2016
@@ -72,7 +72,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)" 
--enable-client=$(GUI) --with-followtag="win32-S2_6" --without-readline 
--without-libbz2 --enable-fcdb=sqlite3 --with-sqlite3-prefix=/$(ARCHDIR) 
--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-S2_6" --without-readline 
--enable-fcdb=sqlite3 --with-sqlite3-prefix=/$(ARCHDIR) --enable-fcmp=$(FCMP) 
$(EXTRA_CONFIG)
        # make
        make -C build-$(WINARCH)-$(GUI)
        make -C build-$(WINARCH)-$(GUI)/translations/freeciv update-po
@@ -82,7 +82,7 @@
        # create build directory
        mkdir -p build-$(WINARCH)-ruledit
        # configure
-       cd build-$(WINARCH)-ruledit; ../../../configure 
FREECIV_LABEL_FORCE="<base>-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" 
--without-libbz2 --disable-client --disable-server --disable-fcmp 
--disable-freeciv-manual --enable-ruledit 
--with-qt5-includes=/$(ARCHDIR)/include --with-qt5-libs=/$(ARCHDIR)/lib 
$(EXTRA_CONFIG)
+       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 $(EXTRA_CONFIG)
        # 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