summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-10-28 22:54:12 +0000
committerCarl Hetherington <cth@carlh.net>2018-10-28 23:10:35 +0000
commit0b3264bb9a4be0870c1f1491b54c2e0931a8f7af (patch)
tree1815b105d320ccf6f0ee476564bea6088694db56 /wscript
parent014612cd5a3b01e16d15d49b45f582fed9b19d9b (diff)
Better library detection for configure checks.
Diffstat (limited to 'wscript')
-rw-r--r--wscript12
1 files changed, 3 insertions, 9 deletions
diff --git a/wscript b/wscript
index 49724452a..de9c82d2c 100644
--- a/wscript
+++ b/wscript
@@ -381,9 +381,7 @@ def configure(conf):
int main () { av_ebur128_get_true_peaks (0); }\n
""",
msg='Checking for EBUR128-patched FFmpeg',
- libpath=conf.env['LIBPATH_AVFORMAT'],
- lib='avfilter avutil swresample avcodec avformat swscale postproc',
- includes=conf.env['INCLUDES_AVFORMAT'],
+ uselib='AVCODEC AVFILTER',
define_name='DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG',
mandatory=False)
@@ -397,9 +395,7 @@ def configure(conf):
""",
msg='Checking for AVSubtitleRect::pict',
cxxflags='-Wno-unused-result -Wno-unused-value -Wdeprecated-declarations -Werror',
- libpath=conf.env['LIBPATH_AVCODEC'],
- lib='avcodec',
- includes=conf.env['INCLUDES_AVCODEC'],
+ uselib='AVCODEC',
define_name='DCPOMATIC_HAVE_AVSUBTITLERECT_PICT',
mandatory=False)
@@ -413,9 +409,7 @@ def configure(conf):
""",
msg='Checking for AVComponentDescriptor::depth_minus1',
cxxflags='-Wno-unused-result -Wno-unused-value -Wdeprecated-declarations -Werror',
- libpath=conf.env['LIBPATH_AVUTIL'],
- lib='avutil',
- includes=conf.env['INCLUDES_AVUTIL'],
+ uselib='AVUTIL',
define_name='DCPOMATIC_HAVE_AVCOMPONENTDESCRIPTOR_DEPTH_MINUS1',
mandatory=False)