From 4591025e7d75acade79f743fa9151469dff0c7a0 Mon Sep 17 00:00:00 2001 From: roryf <rory.fitzgerald@ntnu.no> Date: Mon, 8 Apr 2024 11:03:35 +0200 Subject: [PATCH] meson.build for sdl2 changed to allow non-Ascii characthers in file path --- .../subprojects/sdl2_image_windows/meson.build | 7 +++++-- dependencies/subprojects/sdl2_windows/meson.build | 13 +++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dependencies/subprojects/sdl2_image_windows/meson.build b/dependencies/subprojects/sdl2_image_windows/meson.build index 2019035..4a9555b 100644 --- a/dependencies/subprojects/sdl2_image_windows/meson.build +++ b/dependencies/subprojects/sdl2_image_windows/meson.build @@ -1,6 +1,9 @@ project('sdl2_image_windows', 'cpp') -cxx = meson.get_compiler('cpp') +sdl2_main = declare_dependency( + link_args : '-L' + meson.current_source_dir() + '/lib -SDL2_image') + sdl2_image_windows_dep = declare_dependency( - dependencies : [cxx.find_library('SDL2_image', dirs : join_paths(meson.current_source_dir(), 'lib'))], + dependencies : [sdl2_main], include_directories : include_directories(join_paths('include', 'SDL2'))) + diff --git a/dependencies/subprojects/sdl2_windows/meson.build b/dependencies/subprojects/sdl2_windows/meson.build index f24b477..2c9e5b8 100644 --- a/dependencies/subprojects/sdl2_windows/meson.build +++ b/dependencies/subprojects/sdl2_windows/meson.build @@ -1,8 +1,13 @@ project('sdl2_windows', 'cpp') -cxx = meson.get_compiler('cpp') + +sdl2_main = declare_dependency( + link_args : '-L' + meson.current_source_dir() + '/lib -lSDL2main') + +sdl2 = declare_dependency( + link_args : '-L' + meson.current_source_dir() + '/lib -lSDL2') + sdl2_windows_dep = declare_dependency( - dependencies : [cxx.find_library('SDL2main', dirs : join_paths(meson.current_source_dir(), 'lib')), - cxx.find_library('SDL2', dirs : join_paths(meson.current_source_dir(), 'lib'))], + dependencies : [sdl2_main, sdl2], link_args: ['-lmingw32'], - include_directories : include_directories(join_paths('include', 'SDL2'))) + include_directories : include_directories(join_paths('include', 'SDL2'))) \ No newline at end of file -- GitLab