Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic

[dcpomatic.git] / src / tools / wscript

diff --git a/src/tools/wscript b/src/tools/wscript
index 95af35aa2c2f4bca584b0f879cc34e68304083e7..5a837f8450b57aaa4b3371641503c666d3e6071d 100644 (file)
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -1,17 +1,19 @@
 def build(bld):
-    for t in ['makedcp', 'fixlengths']:
+    for t in ['makedcp', 'servomatic_cli']:
         obj = bld(features = 'cxx cxxprogram')
-       obj.uselib = 'BOOST_THREAD'
-       obj.includes = ['..']
+        obj.uselib = 'BOOST_THREAD OPENJPEG DCP AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
+        obj.includes = ['..']
         obj.use    = ['libdvdomatic']
         obj.source = '%s.cc' % t
         obj.target = t
 
     if not bld.env.DISABLE_GUI:
-        for t in ['dvdomatic', 'alignomatic']:
+        for t in ['dvdomatic', 'servomatic_gui']:
             obj = bld(features = 'cxx cxxprogram')
-            obj.uselib = 'BOOST_THREAD GTKMM'
+            obj.uselib = 'DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
             obj.includes = ['..']
-            obj.use    = ['libdvdomatic', 'libdvdomatic-gtk']
+            obj.use    = ['libdvdomatic', 'libdvdomatic-wx']
             obj.source = '%s.cc' % t
+            if bld.env.TARGET_WINDOWS:
+                obj.source += ' ../../windows/dvdomatic.rc'
             obj.target = t