summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-02-09 23:06:46 +0000
committerCarl Hetherington <cth@carlh.net>2016-02-09 23:06:46 +0000
commitda66c5b65efdde1f5199b271b3f4da9ca3e4f3c6 (patch)
treef0d811deedcd6abca2f47ac3b6d8d50f0eb5354c
parent3c3caebdb3be32dd00dc6b04d952577d54b47f04 (diff)
Fix non-use of LUFS stuff due to error in waf configuration stage.
-rw-r--r--src/lib/wscript2
-rw-r--r--wscript2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/wscript b/src/lib/wscript
index c538851d5..88cb9d4dc 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -153,7 +153,7 @@ def build(bld):
AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE
BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX
SNDFILE SAMPLERATE POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
- CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU
+ CURL ZIP FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU PATCHED_FFMPEG
"""
if bld.env.TARGET_OSX:
diff --git a/wscript b/wscript
index eb9fb26b7..0536dee26 100644
--- a/wscript
+++ b/wscript
@@ -310,7 +310,7 @@ def configure(conf):
libpath='/usr/local/lib',
lib=['avfilter'],
uselib_store='PATCHED_FFMPEG',
- defines_name='DCPOMATIC_HAVE_PATCHED_FFMPEG',
+ define_name='DCPOMATIC_HAVE_PATCHED_FFMPEG',
mandatory=False)
# Boost