Merge master.

[dcpomatic.git] / test / wscript

diff --git a/test/wscript b/test/wscript
index 5de1a99cea5cb429bdc4b77e50820b400d507409..2fbbdacbf881d84390fcb0b9e7281809b56cbbd0 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -1,15 +1,19 @@
 def configure(conf):
+    boost_test_suffix=''
+    if conf.env.TARGET_WINDOWS:
+        boost_test_suffix='-mt'
+
     conf.check_cxx(fragment = """
                               #define BOOST_TEST_MODULE Config test\n
                              #include <boost/test/unit_test.hpp>\n
                               int main() {}
-                              """, msg = 'Checking for boost unit testing library', lib = 'boost_unit_test_framework', uselib_store = 'BOOST_TEST')
+                              """, msg = 'Checking for boost unit testing library', lib = 'boost_unit_test_framework%s' % boost_test_suffix, uselib_store = 'BOOST_TEST')
 
 def build(bld):
     obj = bld(features = 'cxx cxxprogram')
     obj.name   = 'unit-tests'
-    obj.uselib = 'BOOST_TEST DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
-    obj.use    = 'libdvdomatic'
+    obj.uselib = 'BOOST_TEST CXML DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
+    obj.use    = 'libdcpomatic'
     obj.source = 'test.cc'
     obj.target = 'unit-tests'
     obj.install_path = ''