diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-29 15:07:17 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-29 15:07:17 +0100 |
| commit | 318a778b1b5c98b79b202dc953ff2ac131371a1b (patch) | |
| tree | 52d05d9927c22842c5047a625e07eb9c92f87cdb /src/lib/wscript | |
| parent | 3802ba3df2ac27d4fabdcbd61b9ed84f6adf5627 (diff) | |
| parent | b289602176a4943233cffb75e8ccac379112420a (diff) | |
Fix merge.
Diffstat (limited to 'src/lib/wscript')
| -rw-r--r-- | src/lib/wscript | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/wscript b/src/lib/wscript index 85cbcb7b6..1f870462e 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -36,7 +36,6 @@ sources = """ config.cc content.cc content_factory.cc - content_subtitle.cc cross.cc data.cc dcp_content.cc @@ -132,7 +131,7 @@ def build(bld): obj.name = 'libdcpomatic2' obj.export_includes = ['..'] obj.uselib = """ - AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE + AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++ CURL ZIP PANGOMM CAIROMM XMLSEC SUB |
