From 77b54c35bf9587450cd636e0d7df37e190e28bfb Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Mon, 13 Apr 2026 17:01:47 -0400 Subject: Smaller stuff that went uncommitted Signed-off-by: Andrew Opalach --- src/codec/meson.build | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'src/codec/meson.build') diff --git a/src/codec/meson.build b/src/codec/meson.build index 81144d4..a92a23d 100644 --- a/src/codec/meson.build +++ b/src/codec/meson.build @@ -3,29 +3,37 @@ codec_src = ['packet_ext.c', 'codecs.c'] codec_server_deps = [] codec_client_deps = [] -if get_option('codecs').contains('ffmpeg') +if 'ffmpeg' in get_option('codecs') subdir('ffmpeg') endif -if get_option('codecs').contains('stb_image') - stb = subproject('stb').get_variable('stb') +if 'stb_image' in get_option('codecs') + stb = [] stb_args = ['-DCAMU_HAVE_STB_IMAGE'] + if not compiler.check_header('stb/stb_image.h') + stb = [subproject('stb').get_variable('stb')] + stb_args += ['-DCAMU_LOCAL_STB'] + endif stb_codec = declare_dependency(sources: ['stb_image.c'], dependencies: stb, compile_args: stb_args) codec_server_deps += [stb_codec] codec_client_deps += [stb_codec] endif -if get_option('codecs').contains('wuffs') - wuffs = subproject('wuffs').get_variable('wuffs') +if 'wuffs' in get_option('codecs') + wuffs = [] wuffs_args = ['-DCAMU_HAVE_WUFFS'] + if not compiler.check_header('wuffs/wuffs-v0.4.c') + wuffs = [subproject('wuffs').get_variable('wuffs')] + wuffs_args += ['-DCAMU_LOCAL_WUFFS'] + endif wuffs_codec = declare_dependency(sources: ['wuffs.c'], dependencies: wuffs, compile_args: wuffs_args) codec_server_deps += [wuffs_codec] codec_client_deps += [wuffs_codec] endif -if get_option('codecs').contains('spng') +if 'spng' in get_option('codecs') spng = dependency('spng') spng_args = ['-DCAMU_HAVE_SPNG'] spng_codec = declare_dependency(sources: ['spng.c'], -- cgit v1.2.3-101-g0448