Merge branch 'staging'

[dcpomatic.git] / src / lib / wscript

diff --git a/src/lib/wscript b/src/lib/wscript
index 129b8d9fbc24e9122bca94a1161f1fd763b644fd..7c7a64d580bd63c002b03ba0f06469710af655c2 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -22,7 +22,6 @@ sources = """
           examine_content_job.cc
           exceptions.cc
           filter_graph.cc
-          ffmpeg_compatibility.cc
           ffmpeg_decoder.cc
           film.cc
           filter.cc
@@ -50,7 +49,6 @@ sources = """
           util.cc
           video_decoder.cc
           video_source.cc
-          version.cc
           writer.cc
           """
 
@@ -67,11 +65,12 @@ 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 + ' stack.cpp'
-    else:
-        obj.source = sources
+        obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI'
+        obj.source += ' stack.cpp'
 
     obj.target = 'dvdomatic'