diff --git a/sys/nvdec/meson.build b/sys/nvdec/meson.build index 09c60ecd50..016c3dcac1 100644 --- a/sys/nvdec/meson.build +++ b/sys/nvdec/meson.build @@ -3,13 +3,14 @@ nvdec_sources = [ 'plugin.c' ] +nvcuvid_dep_found = false +nvcuvid_incdirs = [] + nvdec_option = get_option('nvdec') if nvdec_option.disabled() subdir_done() endif -nvcuvid_dep_found = false -nvcuvid_incdirs = [] if host_machine.system() == 'windows' cuda_libdirs = [cuda_libdir] # NOTE: Newer CUDA toolkit versions do not ship with the nvcuvid library, and diff --git a/sys/nvenc/meson.build b/sys/nvenc/meson.build index 2a6739f887..88d3929fd4 100644 --- a/sys/nvenc/meson.build +++ b/sys/nvenc/meson.build @@ -5,14 +5,14 @@ nvenc_sources = [ 'gstnvh265enc.c', ] +use_nvenc_gl = false +extra_c_args = [] + nvenc_option = get_option('nvenc') if nvenc_option.disabled() subdir_done() endif -use_nvenc_gl = false -extra_c_args = [] - if host_machine.system() == 'windows' if cc.has_header('cuda_gl_interop.h', args: '-I' + cuda_incdir) use_nvenc_gl = true