diff --git a/meson.build b/meson.build index cae5e77..0767dba 100644 --- a/meson.build +++ b/meson.build @@ -24,7 +24,7 @@ if build_machine.system() == 'windows' language: 'cpp', ) - sfml_main = dependency('sfml_main') + sfml_main = subproject('sfml').get_variable('sfml_main_dep') opengl32 = cc.find_library('opengl32', required: true) winmm = cc.find_library('winmm', required: true) gdi32 = cc.find_library('gdi32', required: true) @@ -53,23 +53,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') -json = dependency('nlohmann_json') -freetype2 = dependency('freetype2') - -flac = dependency('flac') -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']) -lel_guecs = dependency('lel_guecs') +json = subproject('nlohmann_json').get_variable('nlohmann_json_dep') +freetype2 = subproject('freetype2').get_variable('freetype_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_system = subproject('sfml').get_variable('sfml_system_dep') +sfml_window = subproject('sfml').get_variable('sfml_window_dep') +lel_guecs = subproject('lel-guecs').get_variable('lel_guecs_dep') cmake = import('cmake') opts = cmake.subproject_options() @@ -89,7 +87,7 @@ dependencies += [ fmt, json, freetype2, flac, ogg, vorbis, vorbisfile, vorbisenc, sfml_audio, sfml_graphics, - sfml_network, sfml_system, + sfml_system, sfml_window, libgit2package, efsw, lel_guecs ]