diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-02 12:47:17 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-02 12:47:17 +0100 |
| commit | 938f413bb4ebecd51c805027e331cb7eb0ca9502 (patch) | |
| tree | 27fa1618657055b7421d4987b25987b48958b764 /test | |
| parent | c2bac22380bea453665a24c6f39200a977771daf (diff) | |
| parent | f51e1ec6f5cacd05196ce7625709c18f6b38f63e (diff) | |
Merge master; at least partially.
Diffstat (limited to 'test')
| -rw-r--r-- | test/rewrite_subs.cc | 1 | ||||
| -rw-r--r-- | test/wscript | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/test/rewrite_subs.cc b/test/rewrite_subs.cc index adb9f6b4..8c055d9e 100644 --- a/test/rewrite_subs.cc +++ b/test/rewrite_subs.cc @@ -3,6 +3,7 @@ #include "cpl.h" #include "reel.h" #include "subtitle_asset.h" +#include "exceptions.h" using std::cout; using std::cerr; diff --git a/test/wscript b/test/wscript index d22875e9..2892bf9e 100644 --- a/test/wscript +++ b/test/wscript @@ -18,7 +18,7 @@ def configure(conf): def build(bld): obj = bld(features = 'cxx cxxprogram') obj.name = 'tests' - obj.uselib = 'BOOST_TEST OPENJPEG XMLSEC1' + obj.uselib = 'BOOST_TEST OPENJPEG CXML XMLSEC1' obj.use = 'libdcp' obj.source = 'tests.cc' obj.target = 'tests' @@ -26,7 +26,7 @@ def build(bld): obj = bld(features = 'cxx cxxprogram') obj.name = 'subs_in_out' - obj.uselib = 'BOOST_TEST OPENJPEG' + obj.uselib = 'BOOST_TEST OPENJPEG CXML' obj.use = 'libdcp' obj.source = 'subs_in_out.cc' obj.target = 'subs_in_out' @@ -34,7 +34,7 @@ def build(bld): obj = bld(features = 'cxx cxxprogram') obj.name = 'rewrite_subs' - obj.uselib = 'BOOST_TEST OPENJPEG' + obj.uselib = 'BOOST_TEST OPENJPEG CXML' obj.use = 'libdcp' obj.source = 'rewrite_subs.cc' obj.target = 'rewrite_subs' |