Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x

[dcpomatic.git] / src / tools / wscript

diff --git a/src/tools/wscript b/src/tools/wscript
index 06c712f0d10b671c516bb990ede15281d2bde2f8..8af9e7589f1fe744f68ac96c740cde5cdd4b3fde 100644 (file)
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -37,11 +37,11 @@ def build(bld):
 
     cli_tools = []
     if bld.env.VARIANT == 'swaroop-theater':
-        cli_tools = ['dcpomatic_player', 'dcpomatic_playlist', 'dcpomatic_uuid']
-    elif bld.env.VARIANT == "swaroop-studio":
-        cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create', 'dcpomatic_player', 'dcpomatic_playlist', 'dcpomatic_ecinema', 'dcpomatic_uuid']
+        cli_tools = ['swaroop_dcpomatic_uuid']
+    elif bld.env.VARIANT == 'swaroop-studio':
+        cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create', 'swaroop_dcpomatic_ecinema', 'swaroop_dcpomatic_uuid']
     else:
-        cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create', 'dcpomatic_player']
+        cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create']
 
     for t in cli_tools:
         obj = bld(features='cxx cxxprogram')
@@ -49,14 +49,16 @@ def build(bld):
         obj.includes = ['..']
         obj.use    = ['libdcpomatic2']
         obj.source = '%s.cc' % t
-        obj.target = t.replace('dcpomatic', 'dcpomatic2')
+        obj.target = t.replace('dcpomatic', 'dcpomatic2').replace('swaroop_', '')
         if t == 'server_test':
             obj.install_path = None
 
     gui_tools = []
     if not bld.env.DISABLE_GUI:
         if bld.env.VARIANT == 'swaroop-theater':
-            gui_tools = ['dcpomatic_player', 'dcpomatic_playlist']
+            gui_tools = ['dcpomatic_player', 'swaroop_dcpomatic_playlist']
+        elif bld.env.VARIANT == 'swaroop-studio':
+            gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player', 'swaroop_dcpomatic_playlist']
         else:
             gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player', 'dcpomatic_playlist']
 
@@ -68,12 +70,14 @@ def build(bld):
         obj.uselib += ' WXWIDGETS'
         if not bld.env.TARGET_OSX:
             obj.uselib += ' GL GLU'
+        if bld.env.TARGET_LINUX:
+            obj.uselib += ' X11'
         obj.includes = ['..']
         obj.use    = ['libdcpomatic2', 'libdcpomatic2-wx']
         obj.source = '%s.cc' % t
         if bld.env.TARGET_WINDOWS:
             obj.source += ' ../../platform/windows/%s.rc' % t
-        obj.target = t.replace('dcpomatic', 'dcpomatic2')
+        obj.target = t.replace('dcpomatic', 'dcpomatic2').replace('swaroop_', '')
 
     i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic2', bld)