Author: cazfi
Date: Thu Feb 18 03:20:36 2016
New Revision: 31966
URL: http://svn.gna.org/viewcvs/freeciv?rev=31966&view=rev
Log:
Do not even try to build audio support to msys2 based Installer builds.
See patch #6963
Modified:
trunk/doc/README.msys2
trunk/win32/installer_msys2/Makefile
Modified: trunk/doc/README.msys2
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.msys2?rev=31966&r1=31965&r2=31966&view=diff
==============================================================================
--- trunk/doc/README.msys2 (original)
+++ trunk/doc/README.msys2 Thu Feb 18 03:20:36 2016
@@ -17,7 +17,7 @@
selection freeciv can be built.
- Buildable clients are gtk3 and Qt
- Audio support cannot be built in
-- Both server and client launch ok
+- Both server and gtk3-client launch ok, Qt client does not
- Most Installers cannot be built
- Buildable Installers:
- Ruledit
@@ -100,6 +100,11 @@
Notable components that do build with nls are the server and
ruledit.
+- 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
+ msys2 environment.
+
====================================
Instructions used with msys1 below. These need to be updated:
Modified: trunk/win32/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/Makefile?rev=31966&r1=31965&r2=31966&view=diff
==============================================================================
--- trunk/win32/installer_msys2/Makefile (original)
+++ trunk/win32/installer_msys2/Makefile Thu Feb 18 03:20:36 2016
@@ -52,7 +52,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
--enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
+ 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 --enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
# make
make -C build-$(WINARCH)-$(GUI)
make -C build-$(WINARCH)-$(GUI)/translations/freeciv update-po
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
