From 95d8466f8bb2810df62e804ff81628da9b47d235 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 9 Jul 2025 04:02:06 +0300 Subject: [PATCH 84/86] Msys2: Define installation of sound dlls per client See RM #1593 Signed-off-by: Marko Lindqvist --- platforms/windows/installer_msys2/Makefile.meson | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/platforms/windows/installer_msys2/Makefile.meson b/platforms/windows/installer_msys2/Makefile.meson index 46c47fa630..f2cd69d8db 100644 --- a/platforms/windows/installer_msys2/Makefile.meson +++ b/platforms/windows/installer_msys2/Makefile.meson @@ -171,7 +171,7 @@ install-ruledit-common: clean-ruledit-install-arch cp $(BUILD_DIR)/$(WINARCH)-ruledit-$(GUI)/langstat_*.txt $(INST_DIR)/$(WINARCH)-ruledit-$(GUI)/doc/freeciv/installer/ cp freeciv-ruledit.cmd Freeciv.url $(INST_DIR)/$(WINARCH)-ruledit-$(GUI)/ -SOUND_DLLS := \ +SOUND_DLLS_SDL2 := \ SDL2.dll \ SDL2_mixer.dll \ libFLAC.dll \ @@ -244,13 +244,9 @@ COMMON_DLLS := \ libngtcp2-16.dll \ libngtcp2_crypto_ossl.dll -CLIENT_COMMON_DLLS := \ - $(SOUND_DLLS) - install-env-common: # Add DLLs cp -R $(addprefix $(DLLPATH_PREFIX), $(COMMON_DLLS)) $(INST_DIR)/$(WINARCH)-client-$(GUI)/ - cp -R $(addprefix $(DLLPATH_PREFIX), $(CLIENT_COMMON_DLLS)) $(INST_DIR)/$(WINARCH)-client-$(GUI)/ mkdir -p $(INST_DIR)/$(WINARCH)-client-$(GUI)/ssl/certs cp -R /$(ARCHDIR)/etc/ssl/certs/ca-bundle.crt $(INST_DIR)/$(WINARCH)-client-$(GUI)/ssl/certs/ @@ -327,10 +323,13 @@ install-freeciv-qt6: install-freeciv-common install-freeciv-qt6x: install-freeciv-common install-env-gtk3.22: install-env-gtk3-fcmp + cp -R $(addprefix $(DLLPATH_PREFIX), $(SOUND_DLLS_SDL2)) $(INST_DIR)/$(WINARCH)-client-$(GUI)/ install-env-gtk4: install-env-gtk4-fcmp + cp -R $(addprefix $(DLLPATH_PREFIX), $(SOUND_DLLS_SDL2)) $(INST_DIR)/$(WINARCH)-client-$(GUI)/ install-env-gtk4x: install-env-gtk4-fcmp + cp -R $(addprefix $(DLLPATH_PREFIX), $(SOUND_DLLS_SDL2)) $(INST_DIR)/$(WINARCH)-client-$(GUI)/ SDL2_DLLS := \ SDL2_ttf.dll \ @@ -351,6 +350,7 @@ SDL2_DLLS := \ install-env-sdl2: install-env-gtk4-fcmp # Add DLLs cp -R $(addprefix $(DLLPATH_PREFIX), $(SDL2_DLLS)) $(INST_DIR)/$(WINARCH)-client-$(GUI)/ + cp -R $(addprefix $(DLLPATH_PREFIX), $(SOUND_DLLS_SDL2)) $(INST_DIR)/$(WINARCH)-client-$(GUI)/ FCMP_QT6_DLLS := \ Qt6Core.dll \ @@ -376,6 +376,7 @@ CLIENT_QT6_DLLS := \ install-env-qt6: install-env-qt6-fcmp # Add DLLs cp -R $(addprefix $(DLLPATH_PREFIX), $(CLIENT_QT6_DLLS)) $(INST_DIR)/$(WINARCH)-client-$(GUI)/ + cp -R $(addprefix $(DLLPATH_PREFIX), $(SOUND_DLLS_SDL2)) $(INST_DIR)/$(WINARCH)-client-$(GUI)/ install-env-qt6x: install-env-qt6 -- 2.47.2