From 821908d2773d0ba9dd76126f1dbbb9759ba7c4ff Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 18 Jul 2014 14:22:19 +0100 Subject: Make 2.0 branch parallel installable with 1.x. --- test/wscript | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/wscript') diff --git a/test/wscript b/test/wscript index 59e003ac2..3345d9eb8 100644 --- a/test/wscript +++ b/test/wscript @@ -12,8 +12,8 @@ def configure(conf): def build(bld): obj = bld(features='cxx cxxprogram') obj.name = 'unit-tests' - obj.uselib = 'BOOST_TEST BOOST_THREAD DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML' - obj.use = 'libdcpomatic' + obj.uselib = 'BOOST_TEST BOOST_THREAD DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML MAGICK' + obj.use = 'libdcpomatic2' obj.source = """ 4k_test.cc audio_analysis_test.cc @@ -65,7 +65,7 @@ def build(bld): obj = bld(features='cxx cxxprogram') obj.name = 'long-unit-tests' obj.uselib = 'BOOST_TEST DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML' - obj.use = 'libdcpomatic' + obj.use = 'libdcpomatic2' obj.source = """ test.cc """ -- cgit v1.2.3