diff --git a/dependencies/subprojects/sdl2_image_windows/meson.build b/dependencies/subprojects/sdl2_image_windows/meson.build index 4a9555b33a702e030053829b89851da277ed0d5a..2019035d5b642cbd47647b1dbc14f70b2c68304e 100644 --- a/dependencies/subprojects/sdl2_image_windows/meson.build +++ b/dependencies/subprojects/sdl2_image_windows/meson.build @@ -1,9 +1,6 @@ project('sdl2_image_windows', 'cpp') -sdl2_main = declare_dependency( - link_args : '-L' + meson.current_source_dir() + '/lib -SDL2_image') - +cxx = meson.get_compiler('cpp') sdl2_image_windows_dep = declare_dependency( - dependencies : [sdl2_main], + dependencies : [cxx.find_library('SDL2_image', dirs : join_paths(meson.current_source_dir(), 'lib'))], 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 2c9e5b8dd97982cc9032f476f5888b36e36063b9..f24b47750c2c134f5a36ecf9eac138f5390ef42b 100644 --- a/dependencies/subprojects/sdl2_windows/meson.build +++ b/dependencies/subprojects/sdl2_windows/meson.build @@ -1,13 +1,8 @@ project('sdl2_windows', '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') - +cxx = meson.get_compiler('cpp') sdl2_windows_dep = declare_dependency( - dependencies : [sdl2_main, sdl2], + 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'))], link_args: ['-lmingw32'], - include_directories : include_directories(join_paths('include', 'SDL2'))) \ No newline at end of file + include_directories : include_directories(join_paths('include', 'SDL2')))