From 643615954276377da39eceb0a721c4517e50a86e Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 2 Mar 2022 07:49:29 +0200 Subject: [PATCH 06/44] Msys2 Makefile.meson: Enable audio See osdn #43802 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile.meson | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index 50b9cde3c1..60af3f1bb7 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -49,7 +49,7 @@ installer-common: clean-install-common install-freeciv-$(GUI) install-freeciv-common: # create build directory mkdir -p meson-build-$(GUI) - cd meson-build-$(GUI); meson ../../.. -Dprefix=`pwd`/../meson-install-$(GUI) -Dclients=$(CLIENT) -Dfcmp=$(FCMP) -Daudio=false $(EXTRA_CONFIG) + cd meson-build-$(GUI); meson ../../.. -Dprefix=`pwd`/../meson-install-$(GUI) -Dclients=$(CLIENT) -Dfcmp=$(FCMP) $(EXTRA_CONFIG) cd meson-build-$(GUI); ninja cd meson-build-$(GUI); ninja install # reorder directory layout @@ -61,6 +61,18 @@ install-freeciv-common: cp licenses/COPYING.installer meson-install-$(GUI)/doc/freeciv/installer/ cp freeciv-server.cmd freeciv-mp-$(FCMP).cmd freeciv-$(CLIENT).cmd Freeciv.url meson-install-$(GUI)/ +SOUND_DLLS := \ + SDL2.dll \ + SDL2_mixer.dll \ + libFLAC.dll \ + libopusfile-0.dll \ + libopus-0.dll \ + libmpg123-0.dll \ + libvorbisfile-3.dll \ + libvorbis-0.dll \ + libogg-0.dll \ + libssp-0.dll + COMMON_DLLS := \ libcairo-2.dll \ libgdk_pixbuf-2.0-0.dll \ @@ -103,7 +115,8 @@ COMMON_DLLS := \ libssh2-1.dll \ libssl-1_1${CRYPTOLIB_SUFFIX}.dll \ libreadline8.dll \ - libtermcap-0.dll + libtermcap-0.dll \ + $(SOUND_DLLS) install-env-common: # add DLLs -- 2.35.1