From 37a7d308a64c308219ccbc30b987b216487ba283 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 29 Sep 2023 00:44:02 +0300 Subject: [PATCH 39/39] Meson: Link sdl3-client against sdl3 libs See osdn #48746 Signed-off-by: Marko Lindqvist --- meson.build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 090fed15ee..ce7ba03070 100644 --- a/meson.build +++ b/meson.build @@ -805,8 +805,8 @@ endif if get_option('clients').contains('sdl3') if host_system == 'windows' sdl3main_dep = [c_compiler.find_library('mingw32', dirs: cross_lib_path), - c_compiler.find_library('SDL2main', dirs: cross_lib_path), - c_compiler.find_library('SDL2', dirs: cross_lib_path)] + c_compiler.find_library('SDL3main', dirs: cross_lib_path), + c_compiler.find_library('SDL3', dirs: cross_lib_path)] else if emscripten emscripten_sdl3_args = [ @@ -823,7 +823,7 @@ if get_option('clients').contains('sdl3') add_global_link_arguments(emscripten_sdl3_args, language: ['c', 'cpp']) sdl3main_dep = [] else - sdl3main_dep = [c_compiler.find_library('SDL2', dirs: cross_lib_path)] + sdl3main_dep = [c_compiler.find_library('SDL3', dirs: cross_lib_path)] endif endif endif @@ -3750,7 +3750,7 @@ sdl3_image_dep = [] sdl3_ttf_dep = [] if not emscripten - sdl3_gfx_dep = c_compiler.find_library('SDL2_gfx', dirs: cross_lib_path, + sdl3_gfx_dep = c_compiler.find_library('SDL3_gfx', dirs: cross_lib_path, required: false) if not sdl3_gfx_dep.found() @@ -3759,9 +3759,9 @@ if not emscripten sdl3_gfx_cargs = '-DSDL2_GFX_FROM_TREE' endif - sdl3_image_dep = c_compiler.find_library('SDL2_image', dirs: cross_lib_path, + sdl3_image_dep = c_compiler.find_library('SDL3_image', dirs: cross_lib_path, required: false) - sdl3_ttf_dep = c_compiler.find_library('SDL2_ttf', dirs: cross_lib_path, + sdl3_ttf_dep = c_compiler.find_library('SDL3_ttf', dirs: cross_lib_path, required: false) endif -- 2.40.1