Barely-functioning GL playback with new arrangement.

[dcpomatic.git] / src / tools / wscript

diff --git a/src/tools/wscript b/src/tools/wscript
index 80254b0b94c0fd572f734d9aa27c8a246e14c407..3b2c0a04ca6eb5b3aaf778563e36a3dcef0f068e 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 = [ 'dcpomatic_uuid']
+    elif bld.env.VARIANT == "swaroop-studio":
+        cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create', 'dcpomatic_ecinema', 'dcpomatic_uuid']
     else:
-        cli_tools = ['dcpomatic_ecinema', 'dcpomatic_uuid']
+        cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create']
 
     for t in cli_tools:
         obj = bld(features='cxx cxxprogram')
@@ -53,7 +55,7 @@ def build(bld):
 
     gui_tools = []
     if not bld.env.DISABLE_GUI:
-        if bld.env.VARIANT == 'swaroop':
+        if bld.env.VARIANT == 'swaroop-theater':
             gui_tools = ['dcpomatic_player', 'dcpomatic_playlist']
         else:
             gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player', 'dcpomatic_playlist']
@@ -64,6 +66,10 @@ 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