X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fwscript;h=22ae2ad441108e43ccbf6ced059e10554010e606;hb=c1d296b163ddf88a5b387f98e7e77988a242a996;hp=ba2d3092ef6c4a07ccfc01b6eab6c7de6f2ba1e1;hpb=b60fd2d2b68be2a2fcfe067fd5a96af5b08e3a8d;p=libdcp.git

diff --git a/test/wscript b/test/wscript
index ba2d3092..22ae2ad4 100644
--- a/test/wscript
+++ b/test/wscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of libdcp.
 #
@@ -32,8 +32,10 @@
 #
 
 def configure(conf):
-    if conf.options.target_windows:
-        boost_lib_suffix = '-mt'
+    if conf.options.target_windows_64:
+        boost_lib_suffix = '-mt-x64'
+    elif conf.options.target_windows_32:
+        boost_lib_suffix = '-mt-x32'
     else:
         boost_lib_suffix = ''
 
@@ -51,8 +53,10 @@ def configure(conf):
 def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'tests'
-    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM BOOST_DATETIME BOOST_REGEX OPENJPEG CXML XMLSEC1 SNDFILE OPENMP ASDCPLIB_CTH LIBXML++ OPENSSL'
-    obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0']
+    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM BOOST_DATETIME OPENJPEG CXML XMLSEC1 SNDFILE OPENMP ASDCPLIB_CTH LIBXML++ OPENSSL XERCES DL'
+    obj.cppflags = ['-fno-inline', '-fno-elide-constructors', '-g', '-O0']
+    if bld.env['CXX_NAME'] == 'gcc':
+        obj.cppflags.append('-fno-default-inline')
     if bld.is_defined('HAVE_GCOV'):
         obj.use = 'libdcp%s_gcov' % bld.env.API_VERSION
         obj.lib = ['gcov']
@@ -66,6 +70,9 @@ def build(bld):
                  certificates_test.cc
                  colour_test.cc
                  colour_conversion_test.cc
+                 combine_test.cc
+                 cpl_test.cc
+                 cpl_metadata_test.cc
                  cpl_sar_test.cc
                  cpl_ratings_test.cc
                  dcp_font_test.cc
@@ -75,30 +82,36 @@ def build(bld):
                  effect_test.cc
                  encryption_test.cc
                  exception_test.cc
+                 file_test.cc
                  fraction_test.cc
                  frame_info_hash_test.cc
                  gamma_transfer_function_test.cc
                  interop_load_font_test.cc
+                 interop_subtitle_test.cc
                  local_time_test.cc
                  make_digest_test.cc
                  markers_test.cc
+                 mca_test.cc
                  kdm_test.cc
                  key_test.cc
+                 language_tag_test.cc
                  raw_convert_test.cc
                  read_dcp_test.cc
-                 read_interop_subtitle_test.cc
-                 read_smpte_subtitle_test.cc
+                 read_change_write_test.cc
                  reel_asset_test.cc
                  recovery_test.cc
                  rgb_xyz_test.cc
                  round_trip_test.cc
+                 shared_subtitle_test.cc
                  smpte_load_font_test.cc
                  smpte_subtitle_test.cc
+                 sound_asset_writer_test.cc
                  sound_frame_test.cc
+                 stream_operators.cc
+                 sync_test.cc
                  test.cc
                  util_test.cc
                  utf8_test.cc
-                 write_subtitle_test.cc
                  verify_test.cc
                  """
     obj.target = 'tests'
@@ -106,8 +119,10 @@ def build(bld):
 
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'subs_in_out'
-    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM BOOST_REGEX OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL'
-    obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0']
+    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL DL LIBXML++'
+    obj.cppflags = ['-fno-inline', '-fno-elide-constructors', '-g', '-O0']
+    if bld.env['CXX_NAME'] == 'gcc':
+        obj.cppflags.append('-fno-default-inline')
     if bld.is_defined('HAVE_GCOV'):
         obj.use = 'libdcp%s_gcov' % bld.env.API_VERSION
         obj.lib = ['gcov']
@@ -121,8 +136,10 @@ def build(bld):
 
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'rewrite_subs'
-    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM BOOST_REGEX OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL'
-    obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0']
+    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL DL LIBXML++'
+    obj.cppflags = ['-fno-inline', '-fno-elide-constructors', '-g', '-O0']
+    if bld.env['CXX_NAME'] == 'gcc':
+        obj.cppflags.append('-fno-default-inline')
     if bld.is_defined('HAVE_GCOV'):
         obj.use = 'libdcp%s_gcov' % bld.env.API_VERSION
         obj.lib = ['gcov']
@@ -133,11 +150,3 @@ def build(bld):
     obj.source = 'rewrite_subs.cc'
     obj.target = 'rewrite_subs'
     obj.install_path = ''
-
-    obj = bld(features='cxx cxxprogram')
-    obj.name   = 'bench'
-    obj.uselib = 'BOOST_FILESYSTEM BOOST_REGEX OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL LIBXML++'
-    obj.use = 'libdcp%s' % bld.env.API_VERSION
-    obj.source = 'bench.cc'
-    obj.target = 'bench'
-    obj.install_path = ''