Author: cazfi Date: Fri Aug 5 10:46:08 2016 New Revision: 33461 URL: http://svn.gna.org/viewcvs/freeciv?rev=33461&view=rev Log: Enabled sqlite3 based authentication on msys2 based Windows Installer builds.
See patch #7546 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=33461&r1=33460&r2=33461&view=diff ============================================================================== --- branches/S2_6/doc/README.msys2 (original) +++ branches/S2_6/doc/README.msys2 Fri Aug 5 10:46:08 2016 @@ -204,11 +204,6 @@ Either avoid installing libreadline-devel package to your msys2 environment at all, or configure freeciv with --without-readline -- Build fails if Native Language Support and sqlite3 user - authentication database are enabled simultaneously. - Use configure option --disable-nls to build without - Native Language Support, if you use --enable-fcdb=sqlite3 - - Linking against SDL2, including audio support for any client, fails. Use configure option --disable-sdl-mixer to build without audio support, or avoid installing any SDL2 packages to your @@ -221,11 +216,6 @@ TODO ==================================== -- Sqlite3 based authentication support was disabled without - removing any dll's from the installer packages. If sqlite is - not restored in near future, please review what related dlls - are packaged and could be removed. - - 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 Modified: branches/S2_6/win32/installer_msys2/Makefile URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=33461&r1=33460&r2=33461&view=diff ============================================================================== --- branches/S2_6/win32/installer_msys2/Makefile (original) +++ branches/S2_6/win32/installer_msys2/Makefile Fri Aug 5 10:46:08 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 --disable-sdl-mixer --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-S2_6" --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/freeciv update-po @@ -187,7 +187,8 @@ libpng16-16.dll \ libxml2-2.dll \ zlib1.dll \ - libwinpthread-1.dll + libwinpthread-1.dll \ + libsqlite3-0.dll COMMON_MSYS_DLLS := \ 2.0.dll \ _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits