From ec7986f24e1755bb06e6c23ad87c7fd130d10aae Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 27 Apr 2017 19:06:48 +0200 Subject: meson: add jpeg version detection --- meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 8e3cc6a..2d6a8d5 100644 --- a/meson.build +++ b/meson.build @@ -49,9 +49,11 @@ if webp_dep.found() config.set('HAVE_LIBWEBP', true) endif -# jpeg transformation support (FIXME: detect version) -trans_srcs = 'jpeg/62/transupp.c' -trans_inc = include_directories('jpeg/62') +# jpeg transformation support +jpeg_run = run_command('scripts/jpeg-version.sh') +jpeg_ver = jpeg_run.stdout().strip() +trans_src = ''.join(['jpeg/', jpeg_ver, '/transupp.c']) +trans_inc = include_directories(''.join(['jpeg/', jpeg_ver])) # write configuration configure_file(output : 'config.h', configuration : config) @@ -68,7 +70,7 @@ fbi_srcs = [ 'fbi.c', 'fb-gui.c', 'desktop.c', 'parseconfig.c', 'fbiconfig.c', 'vt.c', 'kbd.c', 'fbtools.c', 'drmtools.c', 'dither.c', 'filter.c', 'op.c', 'jpegtools.c', - trans_srcs, read_srcs ] + trans_src, read_srcs ] executable('fbi', sources : fbi_srcs, -- cgit