X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fwscript;h=048bdff076ec1dcec97f366d63bcdba15e957ac2;hb=e8a14fc68d393a001bb966a52ad8536dd3058a76;hp=7e2891237f0894b636582ab5ce60cdd3ee7e1632;hpb=9f861f06506d0b1b50172f0defadc5bff3f76871;p=dcpomatic.git

diff --git a/src/tools/wscript b/src/tools/wscript
index 7e2891237..048bdff07 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -1,5 +1,5 @@
 def build(bld):
-    for t in ['makedcp', 'fixlengths']:
+    for t in ['makedcp', 'fixlengths', 'servomatic_cli']:
         obj = bld(features = 'cxx cxxprogram')
     	obj.uselib = 'BOOST_THREAD'
 	obj.includes = ['..']
@@ -8,13 +8,15 @@ def build(bld):
         obj.target = t
 
     if not bld.env.DISABLE_GUI:
-        p = ['dvdomatic', 'alignomatic']
+#        p = ['dvdomatic', 'alignomatic']
+        p = ['dvdomatic', 'servomatic_gui']
         if not bld.env.DISABLE_PLAYER:
             p.append('playomatic')
         for t in p:
             obj = bld(features = 'cxx cxxprogram')
-            obj.uselib = 'BOOST_THREAD GTKMM'
             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