diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2017-04-27 19:06:48 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2017-04-27 19:06:48 +0200 |
| commit | ec7986f24e1755bb06e6c23ad87c7fd130d10aae (patch) | |
| tree | 0621419e83b2d50cc52188716edb828ee9512e2e | |
| parent | cf052f54be886ed1b98623147e4c1e6bb56a1d65 (diff) | |
| download | fbida-ec7986f24e1755bb06e6c23ad87c7fd130d10aae.tar.gz | |
meson: add jpeg version detection
| -rw-r--r-- | meson.build | 10 |
1 files changed, 6 insertions, 4 deletions
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, |