X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fwscript;h=7b01d0aced607601c38fcb1ed6619307caa9ae52;hp=46909ece53db152db41469f754e7f354414359fb;hb=ad3db3fba475d133864a9d99bf821badbcb31dba;hpb=58b7779d3b5563077898fe5745802fd9a753523d

diff --git a/src/tools/wscript b/src/tools/wscript
index 46909ece5..7b01d0ace 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -37,9 +37,9 @@ def build(bld):
 
     cli_tools = []
     if bld.env.VARIANT != "swaroop":
-        cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create', 'dcpomatic_uuid']
+        cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create']
     else:
-        cli_tools = ['dcpomatic_ecinema']
+        cli_tools = ['dcpomatic_ecinema', 'dcpomatic_uuid']
 
     for t in cli_tools:
         obj = bld(features='cxx cxxprogram')
@@ -56,7 +56,7 @@ def build(bld):
         if bld.env.VARIANT == 'swaroop':
             gui_tools = ['dcpomatic_player', '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,6 +64,8 @@ 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'
         obj.includes = ['..']
         obj.use    = ['libdcpomatic2', 'libdcpomatic2-wx']
         obj.source = '%s.cc' % t
@@ -74,7 +76,7 @@ def build(bld):
     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')