From 2db7a148d390a648013c45a22c31eeb117382466 Mon Sep 17 00:00:00 2001 From: Dudemanguy Date: Sun, 19 Dec 2021 11:41:34 -0600 Subject: meson: remove unneccesary shaderc_static check shaderc is a special case dependency in meson. According to the documentation*, it first checks for shaderc_shared and will fallback to shaderc_combined (the order is reversed if the static keyword is true). However, shaderc also has a third .pc file (shaderc_static) which should be checked. The meson documentation doesn't indicate this, but it also actually checks shaderc_static*. shaderc_combined is first checked if meson looks for static libs and if that is not found it tries shaderc_static. So this extra fallback check is not needed. *: https://mesonbuild.com/Dependencies.html#shaderc *: https://github.com/mesonbuild/meson/blob/a2934ca9d13ede4eb97b320bc768319ecad7b525/mesonbuild/dependencies/misc.py#L539 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index fe0fbdaf6c..00954aca9e 100644 --- a/meson.build +++ b/meson.build @@ -997,7 +997,7 @@ if sdl2_video.allowed() sources += files('video/out/vo_sdl.c') endif -shaderc = dependency('shaderc', 'shaderc_static', required: get_option('shaderc')) +shaderc = dependency('shaderc', required: get_option('shaderc')) if shaderc.found() dependencies += shaderc features += shaderc.name() -- cgit v1.2.3