diff options
| author | Dudemanguy <random342@airmail.cc> | 2021-12-19 11:41:34 -0600 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2021-12-19 19:11:56 +0000 |
| commit | 2db7a148d390a648013c45a22c31eeb117382466 (patch) | |
| tree | eac60eefb5d3bafb64955695cdde4bab7cfacaa2 | |
| parent | 2858073fd03616f6fef0351256fc897352088987 (diff) | |
| download | mpv-2db7a148d390a648013c45a22c31eeb117382466.tar.bz2 mpv-2db7a148d390a648013c45a22c31eeb117382466.tar.xz | |
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
| -rw-r--r-- | meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
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() |