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

diff --git a/src/tools/wscript b/src/tools/wscript
index ed70e5627..7b01d0ace 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -30,28 +30,33 @@ def configure(conf):
 def build(bld):
     uselib =  'BOOST_THREAD BOOST_DATETIME DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC '
     uselib += 'AVUTIL SWSCALE SWRESAMPLE POSTPROC CURL BOOST_FILESYSTEM SSH ZIP CAIROMM FONTCONFIG PANGOMM SUB '
-    uselib += 'MAGICK SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO '
+    uselib += 'SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO PNG '
 
     if bld.env.TARGET_WINDOWS:
         uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE WINSOCK2 OLE32 DSOUND WINMM KSUSER '
 
+    cli_tools = []
     if bld.env.VARIANT != "swaroop":
-        for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create']:
-            obj = bld(features='cxx cxxprogram')
-            obj.uselib = uselib
-            obj.includes = ['..']
-            obj.use    = ['libdcpomatic2']
-            obj.source = '%s.cc' % t
-            obj.target = t.replace('dcpomatic', 'dcpomatic2')
-            if t == 'server_test':
-                obj.install_path = None
+        cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create']
+    else:
+        cli_tools = ['dcpomatic_ecinema', 'dcpomatic_uuid']
+
+    for t in cli_tools:
+        obj = bld(features='cxx cxxprogram')
+        obj.uselib = uselib
+        obj.includes = ['..']
+        obj.use    = ['libdcpomatic2']
+        obj.source = '%s.cc' % t
+        obj.target = t.replace('dcpomatic', 'dcpomatic2')
+        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']
+            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')
@@ -59,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
@@ -69,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')