X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fwscript;h=c59c0f6baff94df420cdb86655fd30694142cc38;hb=0e164ad80f0ceff9d643f3b466690d013c3be19d;hp=bb6484cd83cc09aa31105bc2d91e362bb3173cfa;hpb=3d40a861b4e77f04df7196cffda5b41b9852b2c7;p=dcpomatic.git

diff --git a/test/wscript b/test/wscript
index bb6484cd8..c59c0f6ba 100644
--- a/test/wscript
+++ b/test/wscript
@@ -19,14 +19,16 @@
 
 def configure(conf):
     boost_test_suffix=''
-    if conf.env.TARGET_WINDOWS:
-        boost_test_suffix='-mt'
+    if conf.env.TARGET_WINDOWS_64:
+        boost_test_suffix='-mt-x64'
+    elif conf.env.TARGET_WINDOWS_32:
+        boost_test_suffix='-mt-x32'
 
     conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=True)
 
     conf.check_cxx(fragment="""
                             #define BOOST_TEST_MODULE Config test\n
-    			    #include <boost/test/unit_test.hpp>\n
+                            #include <boost/test/unit_test.hpp>\n
                             int main() {}
                             """, msg = 'Checking for boost unit testing library', lib = 'boost_unit_test_framework%s' % boost_test_suffix, uselib_store = 'BOOST_TEST')
 
@@ -36,7 +38,7 @@ def build(bld):
     obj.uselib =  'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE SAMPLERATE DCP FONTCONFIG CAIROMM PANGOMM XMLPP '
     obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE SWRESAMPLE POSTPROC CXML SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU NETTLE PNG '
     obj.uselib += 'LEQM_NRT ZIP '
-    if bld.env.TARGET_WINDOWS:
+    if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32:
         obj.uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE '
     if bld.env.TARGET_LINUX:
         obj.uselib += 'DL '
@@ -46,6 +48,7 @@ def build(bld):
                  atmos_test.cc
                  audio_analysis_test.cc
                  audio_buffers_test.cc
+                 audio_content_test.cc
                  audio_delay_test.cc
                  audio_filter_test.cc
                  audio_mapping_test.cc