Barely-functioning GL playback with new arrangement.

[dcpomatic.git] / src / tools / wscript

diff --git a/src/tools/wscript b/src/tools/wscript
index 06c712f0d10b671c516bb990ede15281d2bde2f8..3b2c0a04ca6eb5b3aaf778563e36a3dcef0f068e 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 = []
     if bld.env.VARIANT == 'swaroop-theater':

-        cli_tools = ['dcpomatic_player', 'dcpomatic_playlist', 'dcpomatic_uuid']
+        cli_tools = [ 'dcpomatic_uuid']

     elif bld.env.VARIANT == "swaroop-studio":
     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 = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create', 'dcpomatic_ecinema', 'dcpomatic_uuid']

     else:
     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')
 
     for t in cli_tools:
         obj = bld(features='cxx cxxprogram')


@@ -68,6 +68,8 @@ def build(bld):
         obj.uselib += ' WXWIDGETS'
         if not bld.env.TARGET_OSX:
             obj.uselib += ' GL GLU'
         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
         obj.includes = ['..']
         obj.use    = ['libdcpomatic2', 'libdcpomatic2-wx']
         obj.source = '%s.cc' % t