Browse Source

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

pull/177/head
Tal Regev 1 year ago
committed by Steve Lhomme
parent
commit
133b21c235
  1. 2
      modules/access/meson.build
  2. 2
      modules/codec/meson.build
  3. 2
      modules/demux/meson.build
  4. 2
      modules/hw/nvdec/meson.build

2
modules/access/meson.build

@ -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

2
modules/codec/meson.build

@ -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')

2
modules/demux/meson.build

@ -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)

2
modules/hw/nvdec/meson.build

@ -1,5 +1,5 @@
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 )

Loading…
Cancel
Save