Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / src / tools / wscript

diff --git a/src/tools/wscript b/src/tools/wscript
index d0c8a8cd21b14b61ab20d6a48bcd7dba4926e1cc..f45a4270715ca8dde1ff706977243b3774c424ba 100644 (file)
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -35,21 +35,26 @@ def build(bld):
     if bld.env.TARGET_WINDOWS:
         uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE WINSOCK2 OLE32 DSOUND WINMM KSUSER '
 
+    cli_tools = []
     if bld.env.VARIANT != "swaroop":
-        for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create']:
-            obj = bld(features='cxx cxxprogram')
-            obj.uselib = uselib
-            obj.includes = ['..']
-            obj.use    = ['libdcpomatic2']
-            obj.source = '%s.cc' % t
-            obj.target = t.replace('dcpomatic', 'dcpomatic2')
-            if t == 'server_test':
-                obj.install_path = None
+        cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create']
+    else:
+        cli_tools = ['dcpomatic_ecinema', 'dcpomatic_uuid']
+
+    for t in cli_tools:
+        obj = bld(features='cxx cxxprogram')
+        obj.uselib = uselib
+        obj.includes = ['..']
+        obj.use    = ['libdcpomatic2']
+        obj.source = '%s.cc' % t
+        obj.target = t.replace('dcpomatic', 'dcpomatic2')
+        if t == 'server_test':
+            obj.install_path = None
 
     gui_tools = []
     if not bld.env.DISABLE_GUI:
         if bld.env.VARIANT == 'swaroop':
-            gui_tools = ['dcpomatic_player']
+            gui_tools = ['dcpomatic_player', 'dcpomatic_playlist']
         else:
             gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player']