Author: cazfi
Date: Sun Sep 4 17:42:16 2016
New Revision: 33753
URL: http://svn.gna.org/viewcvs/freeciv?rev=33753&view=rev
Log:
Added audio support to msys2 based Windows Installer builds.
See patch #7657
Modified:
trunk/doc/README.msys2
trunk/windows/installer_msys2/Makefile
Modified: trunk/doc/README.msys2
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.msys2?rev=33753&r1=33752&r2=33753&view=diff
==============================================================================
--- trunk/doc/README.msys2 (original)
+++ trunk/doc/README.msys2 Sun Sep 4 17:42:16 2016
@@ -15,7 +15,6 @@
selection freeciv can be built
- Buildable clients are gtk3, gtk2, and Qt
- Official pre-made msys2 environment supports only gtk3-client build
-- Audio support cannot be built in
- Both server, gtk3-client, and gtk2-client launch ok, Qt client does not
- Most Installers cannot be built
- Buildable Installers:
@@ -196,11 +195,6 @@
- Freeciv linked against readline in msys2 does not work.
Configure freeciv with --without-readline
-- 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.
-
- Checking if files are bzip2 compressed crashes freeciv.
Disable bzip2 support with --without-libbz2
@@ -213,8 +207,6 @@
Please review what related dlls are packaged and could be
removed.
-- Audio support via SDL2_mixer
-
- Qt program installers; qt-client and ruledit
- sdl2-client installer
Modified: trunk/windows/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/Makefile?rev=33753&r1=33752&r2=33753&view=diff
==============================================================================
--- trunk/windows/installer_msys2/Makefile (original)
+++ trunk/windows/installer_msys2/Makefile Sun Sep 4 17:42:16 2016
@@ -75,7 +75,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)"
--with-project-definition=../../../bootstrap/snapshot.project
--enable-client=$(GUI) --with-followtag="windows-S3_0" --with-tinycthread
--without-readline --disable-sdl-mixer --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)"
--with-project-definition=../../../bootstrap/snapshot.project
--enable-client=$(GUI) --with-followtag="windows-S3_0" --with-tinycthread
--without-readline --without-libbz2 --enable-fcdb=sqlite3
--with-sqlite3-prefix=/$(ARCHDIR) --enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
# make
make -C build-$(WINARCH)-$(GUI)
make -C build-$(WINARCH)-$(GUI)/translations/core update-po
@@ -167,6 +167,21 @@
cp freeciv-ruledit.cmd Freeciv.url install-$(WINARCH)-ruledit/
# install Freeciv environment
+
+SOUND_DLLS := \
+ SDL2.dll \
+ SDL2_mixer.dll \
+ libFLAC-8.dll \
+ libfluidsynth-1.dll \
+ libmad-0.dll \
+ libmodplug-1.dll \
+ libvorbis-0.dll \
+ libvorbisenc-2.dll \
+ libvorbisfile-3.dll \
+ libogg-0.dll \
+ libportaudio-2.dll \
+ libsndfile-1.dll \
+ libspeex-1.dll
COMMON_DLLS := \
libstdc++-6.dll \
@@ -210,7 +225,8 @@
libwinpthread-1.dll \
libicuuc57.dll \
libicudt57.dll \
- libsqlite3-0.dll
+ libsqlite3-0.dll \
+ $(SOUND_DLLS)
install-env-common:
# add DLLs
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
