Skip to content
Snippets Groups Projects
Commit 133b21c2 authored by Tal Regev's avatar Tal Regev Committed by Steve Lhomme
Browse files

meson: Bug fix. Define meson variable even when option is disabled.

parent 8da8fb82
No related branches found
No related tags found
1 merge request!6809fix meson bugs
Pipeline #564179 passed with stage
in 17 minutes and 57 seconds
......@@ -9,8 +9,8 @@ vlc_modules += {
}
decklink_dep = disabler()
if get_option('decklink').allowed()
decklink_cpp_args = []
if get_option('decklink').allowed()
if host_system == 'windows'
decklink_cpp_args += libcom_cppflags
endif
......
......@@ -102,8 +102,8 @@ vlc_modules += {
}
# libmad codec
if get_option('mad').allowed()
mad_dep = disabler()
if get_option('mad').allowed()
# TODO add support for a custom folder for libmad
if cc.check_header('mad.h')
mad_dep = cc.find_library('mad')
......
......@@ -405,8 +405,8 @@ vlc_modules += {
}
# mpc
if get_option('mpc').allowed()
mpc_dep = disabler()
if get_option('mpc').allowed()
if cc.check_header('mpc/mpcdec.h')
mpc_dep = cc.find_library('mpcdec')
cdata.set('HAVE_MPC_MPCDEC_H', 1)
......
if get_option('nvdec').allowed()
nvdec_dep = disabler()
if get_option('nvdec').allowed()
if cc.check_header('ffnvcodec/dynlink_loader.h')
nvdec_dep = enabler()
elif cc.check_header('ffnvcodec/dynlink_loader.h', dependencies: contrib_dep )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment