diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2017-08-26 09:41:13 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2017-08-26 09:43:34 +0100 |
| commit | 02af0e857b290914e0bbe9e5608b72b6f7064774 (patch) | |
| tree | b8e220a1a9414ab6f9c6551f95a8d9ba2ace77c7 /ext | |
| parent | f3f9e13c12eafc1875c543f2a8638147229c9e7d (diff) | |
twolame: hook up to build system
https://bugzilla.gnome.org/show_bug.cgi?id=774252
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/Makefile.am | 8 | ||||
| -rw-r--r-- | ext/meson.build | 1 | ||||
| -rw-r--r-- | ext/twolame/meson.build | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am index fee653f55..7d3490205 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -101,6 +101,12 @@ else TAGLIB_DIR = endif +if USE_TWOLAME +TWOLAME_DIR = twolame +else +TWOLAME_DIR = +endif + if USE_VPX VPX_DIR=vpx else @@ -132,6 +138,7 @@ SUBDIRS = \ $(SOUP_DIR) \ $(SPEEX_DIR) \ $(TAGLIB_DIR) \ + $(TWOLAME_DIR) \ $(VPX_DIR) \ $(WAVPACK_DIR) @@ -153,6 +160,7 @@ DIST_SUBDIRS = \ soup \ speex \ taglib \ + twolame \ vpx \ wavpack diff --git a/ext/meson.build b/ext/meson.build index 3bc8c8212..2758877a5 100644 --- a/ext/meson.build +++ b/ext/meson.build @@ -23,5 +23,6 @@ if cc.get_id() == 'msvc' else subdir('taglib') endif +subdir('twolame') subdir('vpx') subdir('wavpack') diff --git a/ext/twolame/meson.build b/ext/twolame/meson.build index 029a00eb4..cabab63ad 100644 --- a/ext/twolame/meson.build +++ b/ext/twolame/meson.build @@ -3,7 +3,7 @@ twolame_dep = dependency('twolame', version : '>= 0.3.10', required : false) if twolame_dep.found() twolame = library('gsttwolame', ['gsttwolamemp2enc.c'], - c_args : ugly_args, + c_args : gst_plugins_good_args, include_directories : [configinc, libsinc], dependencies : [gstaudio_dep, twolame_dep], install : true, |