c++11 tidying.
[libsub.git] / src / wscript
index eafd1c9c7e0b20fba0c027711d4c476e139931ac..491111744d0e4c28d111afd7fe3fbf219d18ee15 100644 (file)
@@ -8,7 +8,7 @@ def build(bld):
 
     obj.name = 'libsub%s' % bld.env.API_VERSION
     obj.target = 'sub%s' % bld.env.API_VERSION
-    obj.uselib = 'CXML DCP BOOST_FILESYSTEM BOOST_LOCALE BOOST_REGEX'
+    obj.uselib = 'CXML DCP BOOST_FILESYSTEM BOOST_LOCALE BOOST_REGEX ASDCPLIB_CTH'
     obj.use = 'libkumu-libsub%s libasdcp-libsub%s' % (bld.env.API_VERSION, bld.env.API_VERSION)
     obj.export_includes = ['.']
     obj.source = """
@@ -17,13 +17,16 @@ def build(bld):
                  effect.cc
                  exceptions.cc
                  font_size.cc
-                 interop_dcp_reader.cc
+                 horizontal_position.cc
                  iso6937.cc
                  iso6937_tables.cc
+                 locale_convert.cc
+                 rational.cc
+                 raw_convert.cc
                  raw_subtitle.cc
                  reader.cc
                  reader_factory.cc
-                 smpte_dcp_reader.cc
+                 ssa_reader.cc
                  stl_binary_reader.cc
                  stl_binary_tables.cc
                  stl_binary_writer.cc
@@ -35,11 +38,6 @@ def build(bld):
                  util.cc
                  vertical_reference.cc
                  vertical_position.cc
-                 dcp/font.cc
-                 dcp/interop_load_font.cc
-                 dcp/smpte_load_font.cc
-                 dcp/subtitle.cc
-                 dcp/text.cc
                  """
 
     headers = """
@@ -47,9 +45,15 @@ def build(bld):
               colour.h
               dcp_reader.h
               effect.h
+              exceptions.h
               font_size.h
+              horizontal_position.h
+              horizontal_reference.h
+              rational.h
               raw_subtitle.h
               reader.h
+              reader_factory.h
+              ssa_reader.h
               stl_binary_tables.h
               stl_binary_reader.h
               stl_binary_writer.h