diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-16 16:30:11 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-16 16:30:11 +0100 |
| commit | 0b6c6de07f9a3aa28c2e8ca8ef30340e3fa1bfc6 (patch) | |
| tree | 075a7a604bbd4e072ec1b07481d4eb82ed7ffd34 /src/lib/wscript | |
| parent | 42a122334d594b824c666e5263168386a76801cc (diff) | |
| parent | 016a98b18d01276a1e603885a25785e7389f14d9 (diff) | |
Merge branch 'master' into 12bit
Diffstat (limited to 'src/lib/wscript')
| -rw-r--r-- | src/lib/wscript | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/wscript b/src/lib/wscript index 933368776..6c1da1772 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -40,7 +40,6 @@ sources = """ job.cc job_manager.cc kdm.cc - json_server.cc log.cc md5_digester.cc piece.cc @@ -49,6 +48,7 @@ sources = """ playlist.cc ratio.cc resampler.cc + safe_stringstream.cc scp_dcp_job.cc scaler.cc send_kdm_email_job.cc @@ -68,6 +68,7 @@ sources = """ update.cc util.cc video_content.cc + video_content_scale.cc video_decoder.cc writer.cc """ @@ -83,8 +84,8 @@ def build(bld): obj.uselib = """ 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 QUICKMAIL + SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XMLPP + CURL ZIP QUICKMAIL XMLSEC """ if bld.env.TARGET_OSX: @@ -96,7 +97,7 @@ def build(bld): obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE' obj.source += ' stack.cpp' if bld.env.BUILD_STATIC: - obj.uselib += ' XML++' + obj.uselib += ' XMLPP' obj.target = 'dcpomatic' |