From bb440115132ae06f22176c08d70500185a683299 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 16 Oct 2025 03:18:35 +0300 Subject: [PATCH 15/15] Meson: Fix lookup of sdl3 dependencies See RM #1706 Signed-off-by: Marko Lindqvist --- meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 0540fb544a..cc8f9b007d 100644 --- a/meson.build +++ b/meson.build @@ -898,7 +898,7 @@ endif if get_option('audio') == 'sdl3' or get_option('clients').contains('sdl3') if host_system == 'windows' sdl3main_dep = [c_compiler.find_library('mingw32', dirs: cross_lib_path), - dependency('SDL3')] + dependency('sdl3')] else if emscripten emscripten_sdl3_args = [ @@ -921,7 +921,7 @@ if get_option('audio') == 'sdl3' or get_option('clients').contains('sdl3') add_global_link_arguments(emscripten_sdl3_args, language: ['c', 'cpp']) sdl3main_dep = [] else - sdl3main_dep = [dependency('SDL3')] + sdl3main_dep = [dependency('sdl3')] endif endif endif @@ -947,7 +947,7 @@ if get_option('audio') != 'none' if emscripten audio_dep = [] elif get_option('audio') == 'sdl3' - audio_sdl3_dep = dependency('SDL3_mixer') + audio_sdl3_dep = dependency('sdl3-mixer') audio_dep = [sdl3main_dep, audio_sdl3_dep] priv_conf_data.set('AUDIO_SDL3', 1) else @@ -4045,8 +4045,8 @@ sdl3_ttf_dep = [] if not emscripten sdl3_gfx_inc = include_directories('dependencies') - sdl3_image_dep = dependency('SDL3_image', required: false) - sdl3_ttf_dep = dependency('SDL3_ttf', required: false) + sdl3_image_dep = dependency('sdl3-image', required: false) + sdl3_ttf_dep = dependency('sdl3-ttf', required: false) endif executable('freeciv-sdl3', -- 2.51.0