Merge branch 'master' into trimming

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index 8b49e59338156f94afa7ae6d39f93247e42fd00b..51b103afdc3e639fb357a8e09551551e6f3864b9 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -45,9 +45,9 @@ sources = """
           timer.cc
           transcode_job.cc
           transcoder.cc
+          trimmer.cc
           ui_signaller.cc
           util.cc
-          version.cc
           video_decoder.cc
           video_source.cc
           writer.cc
@@ -68,10 +68,13 @@ def build(bld):
                  """
     if bld.env.TARGET_WINDOWS:
         obj.uselib += ' WINSOCK2'
-    obj.source = sources
+    obj.source = sources + " version.cc"
     obj.target = 'dvdomatic'
 
     i18n.po_to_mo(os.path.join('src', 'lib'), 'libdvdomatic', bld)
 
 def pot(bld):
     i18n.pot(os.path.join('src', 'lib'), sources, 'libdvdomatic')
+
+def pot_merge(bld):
+    i18n.pot_merge(os.path.join('src', 'lib'), 'libdvdomatic')