From 2a1841ed45be19412c78c9772de17ee97d6b5d67 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 10 Oct 2026 14:25:00 +0300 Subject: [PATCH 83/83] Make sdl3 audio the default See RM #2248 Signed-off-by: Marko Lindqvist --- INSTALL | 2 +- doc/README.packaging | 1 + meson_options.txt | 2 +- platforms/windows/installer_msys2/Makefile.meson | 8 ++++---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/INSTALL b/INSTALL index b540308061..9128b85458 100644 --- a/INSTALL +++ b/INSTALL @@ -193,7 +193,7 @@ readline ('try'/'true'/'false') The default is 'try' to enable it if suitable readline found. audio ('none'/'sdl2'/'sdl3'): - What kind of sound support should be built to the clients. Defaults to sdl2. + What kind of sound support should be built to the clients. Defaults to sdl3. tools (array): Extra tools to build: diff --git a/doc/README.packaging b/doc/README.packaging index 30d04b55d6..6a98152a2a 100644 --- a/doc/README.packaging +++ b/doc/README.packaging @@ -24,6 +24,7 @@ Updating from 3.3 to 3.4 * New gtk4x-client that is linked against relatively new gtk4 versions * Build with meson supports building gtk4x modpack installer that is linked against relatively new gtk4 versions +* sdl3 audio is now the default ---------------------------------------------------------------------- Compatibility of modified versions diff --git a/meson_options.txt b/meson_options.txt index 61c0c143e6..9836026e51 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -48,7 +48,7 @@ option('readline', option('audio', type: 'combo', choices: ['none', 'sdl2', 'sdl3'], - value: 'sdl2', + value: 'sdl3', description: 'Sound support type to build') option('tools', diff --git a/platforms/windows/installer_msys2/Makefile.meson b/platforms/windows/installer_msys2/Makefile.meson index 040a75c59f..d7e7ba65f0 100644 --- a/platforms/windows/installer_msys2/Makefile.meson +++ b/platforms/windows/installer_msys2/Makefile.meson @@ -350,13 +350,13 @@ install-freeciv-qt6x: install-freeciv-common cp freeciv-ruledit.cmd $(INST_DIR)/$(WINARCH)-client-$(GUI)/ install-env-gtk3.22: install-env-gtk3-fcmp - cp -R $(addprefix $(DLLPATH_PREFIX), $(SOUND_DLLS_SDL2)) $(INST_DIR)/$(WINARCH)-client-$(GUI)/ + cp -R $(addprefix $(DLLPATH_PREFIX), $(SOUND_DLLS_SDL3)) $(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)/ + cp -R $(addprefix $(DLLPATH_PREFIX), $(SOUND_DLLS_SDL3)) $(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)/ + cp -R $(addprefix $(DLLPATH_PREFIX), $(SOUND_DLLS_SDL3)) $(INST_DIR)/$(WINARCH)-client-$(GUI)/ SDL2_DLLS := \ SDL2_ttf.dll \ @@ -411,7 +411,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)/ + cp -R $(addprefix $(DLLPATH_PREFIX), $(SOUND_DLLS_SDL3)) $(INST_DIR)/$(WINARCH)-client-$(GUI)/ install-env-qt6x: install-env-qt6 -- 2.53.0