From 7f3d0b1b18da5eed3dbd76bad53f120ff976fde1 Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" Date: Sun, 1 Mar 2026 14:44:28 -0500 Subject: [PATCH] Force meson to use the libs I told messon to use. --- meson.build | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/meson.build b/meson.build index d85601a..070e126 100644 --- a/meson.build +++ b/meson.build @@ -51,22 +51,21 @@ elif build_machine.system() == 'darwin' ] endif -catch2 = dependency('catch2-with-main') +catch2 = subproject('catch2').get_variable('catch2_with_main_dep') fmt = subproject('fmt').get_variable('fmt_dep') -freetype2 = dependency('freetype2') +freetype2 = subproject('freetype2').get_variable('freetype_dep') -flac = dependency('flac') -box2d = dependency('box2d') -ogg = dependency('ogg') -vorbis = dependency('vorbis') -vorbisfile = dependency('vorbisfile') -vorbisenc = dependency('vorbisenc') -sfml_audio = dependency('sfml_audio') -sfml_graphics = dependency('sfml_graphics') -sfml_network = dependency('sfml_network') -sfml_system = dependency('sfml_system') -sfml_window = dependency('sfml_window', - default_options: ['default_library=shared']) +box2d = subproject('box2d').get_variable('box2d_dep') +flac = subproject('flac').get_variable('flac_dep') +ogg = subproject('ogg').get_variable('libogg_dep') +vorbis = subproject('vorbis').get_variable('vorbis_dep') +vorbisfile = subproject('vorbis').get_variable('vorbisfile_dep') +vorbisenc = subproject('vorbis').get_variable('vorbisenc_dep') +sfml_audio = subproject('sfml').get_variable('sfml_audio_dep') +sfml_graphics = subproject('sfml').get_variable('sfml_graphics_dep') +sfml_network = subproject('sfml').get_variable('sfml_network_dep') +sfml_system = subproject('sfml').get_variable('sfml_system_dep') +sfml_window = subproject('sfml').get_variable('sfml_window_dep') dependencies += [ fmt, freetype2,