Merge branch 'staging'

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index de39345d57260930cf2012ddd48c33f2e4b1f8e6..7c7a64d580bd63c002b03ba0f06469710af655c2 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -20,8 +20,8 @@ sources = """
           dolby_cp750.cc
           encoder.cc
           examine_content_job.cc
+          exceptions.cc
           filter_graph.cc
-          ffmpeg_compatibility.cc
           ffmpeg_decoder.cc
           film.cc
           filter.cc
@@ -44,9 +44,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
@@ -65,12 +65,19 @@ def build(bld):
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 
                  SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP GLIB LZMA
                  """
+
+    obj.source = sources + ' version.cc'
+
     if bld.env.TARGET_WINDOWS:
-        obj.uselib += ' WINSOCK2'
-    obj.source = sources
+        obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI'
+        obj.source += ' stack.cpp'
+
     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')