X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fwscript;h=22ae2ad441108e43ccbf6ced059e10554010e606;hb=2cb2078282c8b799d7a0d0016e1518f1a4b55af1;hp=173b5e825e832b06d5e2da89db19871256384acb;hpb=0c55c9b8c4f3ef2ddeefd4c0e630e63c3e0e11c1;p=libdcp.git

diff --git a/test/wscript b/test/wscript
index 173b5e82..22ae2ad4 100644
--- a/test/wscript
+++ b/test/wscript
@@ -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 = ''
 
@@ -52,7 +54,9 @@ def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'tests'
     obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM BOOST_DATETIME OPENJPEG CXML XMLSEC1 SNDFILE OPENMP ASDCPLIB_CTH LIBXML++ OPENSSL XERCES DL'
-    obj.cppflags = ['-fno-inline', '-fno-default-inline', '-fno-elide-constructors', '-g', '-O0']
+    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']
@@ -67,6 +71,7 @@ def build(bld):
                  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
@@ -77,10 +82,12 @@ 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
@@ -90,21 +97,21 @@ def build(bld):
                  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'
@@ -112,8 +119,10 @@ def build(bld):
 
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'subs_in_out'
-    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM 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']
@@ -127,8 +136,10 @@ def build(bld):
 
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'rewrite_subs'
-    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM 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']