Author: cazfi
Date: Sun Sep  4 17:42:30 2016
New Revision: 33754

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

See patch #7657

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=33754&r1=33753&r2=33754&view=diff
==============================================================================
--- branches/S2_6/doc/README.msys2      (original)
+++ branches/S2_6/doc/README.msys2      Sun Sep  4 17:42:30 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: branches/S2_6/win32/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=33754&r1=33753&r2=33754&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/Makefile        (original)
+++ branches/S2_6/win32/installer_msys2/Makefile        Sun Sep  4 17:42:30 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-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 
--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/freeciv update-po
@@ -160,6 +160,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 \
@@ -201,7 +216,8 @@
        libxml2-2.dll \
        zlib1.dll \
        libwinpthread-1.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

Reply via email to