diff options
| author | Jörg Krause <joerg.krause@embedded.rocks> | 2019-01-21 08:22:04 +0100 |
|---|---|---|
| committer | Jörg Krause <joerg.krause@embedded.rocks> | 2019-01-21 08:35:17 +0100 |
| commit | 4f7d52dbf2eaee15a517363c846650d76f45739f (patch) | |
| tree | 8dd44e302f2526029455ee661e6dfe6936ad8613 /src/lib | |
| parent | c7848da8f2872f26d10410e8817a37024bf6bfa1 (diff) | |
meson: add fixed-point Vorbis (Tremor) decoder support
Re-add build support for the fixed-point Vorbis (Tremor) decoder, which
was dropped when switching from Autotools to Meson.
Note, that it is not possible to build both, the Vorbis and the Tremor
decoder.
Closes: #405
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/xiph/meson.build | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/xiph/meson.build b/src/lib/xiph/meson.build index a5d6c1929..432958fee 100644 --- a/src/lib/xiph/meson.build +++ b/src/lib/xiph/meson.build @@ -1,6 +1,11 @@ libflac_dep = dependency('flac', version: '>= 1.2', required: get_option('flac')) libopus_dep = dependency('opus', required: get_option('opus')) libvorbis_dep = dependency('vorbis', required: get_option('vorbis')) +libvorbisidec_dep = dependency('vorbisidec', required: get_option('tremor')) + +if get_option('vorbis').enabled() and get_option('tremor').enabled() + error('Cannot build both, the Vorbis decoder AND the Tremor (Vorbis fixed-point) decoder') +endif libvorbisenc_dep = dependency('', required: false) if need_encoder and not get_option('vorbisenc').disabled() @@ -13,7 +18,7 @@ if need_encoder and not get_option('vorbisenc').disabled() endif endif -if libopus_dep.found() or libvorbis_dep.found() or libvorbisenc_dep.found() +if libopus_dep.found() or libvorbis_dep.found() or libvorbisenc_dep.found() or libvorbisidec_dep.found() libogg_dep = dependency('ogg') else libogg_dep = dependency('', required: false) |