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 c71b96ea4f47ff55b8d6f69de77481c79064cb6e..8af9e7589f1fe744f68ac96c740cde5cdd4b3fde 100644 (file)
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -36,10 +36,12 @@ def build(bld):
         uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE WINSOCK2 OLE32 DSOUND WINMM KSUSER '
 
     cli_tools = []
-    if bld.env.VARIANT != "swaroop":
-        cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create']
+    if bld.env.VARIANT == 'swaroop-theater':
+        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_ecinema']
+        cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create']
 
     for t in cli_tools:
         obj = bld(features='cxx cxxprogram')
@@ -47,16 +49,18 @@ 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':
-            gui_tools = ['dcpomatic_player', 'dcpomatic_playlist', 'dcpomatic_uuid']
+        if bld.env.VARIANT == 'swaroop-theater':
+            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']
+            gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player', 'dcpomatic_playlist']
 
     for t in gui_tools:
         obj = bld(features='cxx cxxprogram')
@@ -64,17 +68,21 @@ def build(bld):
         if bld.env.BUILD_STATIC or bld.env.TARGET_LINUX:
             obj.uselib += ' GTK'
         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)
 
 def pot(bld):
-    i18n.pot(os.path.join('src', 'tools'), 'dcpomatic.cc dcpomatic_batch.cc dcpomatic_kdm.cc dcpomatic_server.cc dcpomatic_player.cc', 'dcpomatic')
+    i18n.pot(os.path.join('src', 'tools'), 'dcpomatic.cc dcpomatic_batch.cc dcpomatic_kdm.cc dcpomatic_server.cc dcpomatic_player.cc dcpomatic_playlist.cc', 'dcpomatic')
 
 def pot_merge(bld):
     i18n.pot_merge(os.path.join('src', 'tools'), 'dcpomatic')