X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fwscript;h=be5297beb06e8cee0f1ac1f6acf73fc49ca905dd;hp=84351e9658f62bcd437f7a51983ed6b415b6987e;hb=f37c1e40dcd5186c5aee95a4b0e6607c1b0045e4;hpb=72b11d5eb036651b6ff68edf3ed270e8fc52960f

diff --git a/src/tools/wscript b/src/tools/wscript
index 84351e965..be5297beb 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of DCP-o-matic.
 #
@@ -23,35 +23,48 @@ from waflib import Logs
 import i18n
 
 def configure(conf):
-    if conf.env.TARGET_WINDOWS:
+    if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32:
         conf.env.append_value('CXXFLAGS', ['-mconsole'])
         conf.env.append_value('LINKFLAGS', ['-mconsole'])
 
 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 += 'SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO '
+    uselib += 'SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO PNG JPEG LEQM_NRT '
 
-    if bld.env.TARGET_WINDOWS:
-        uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE WINSOCK2 OLE32 DSOUND WINMM KSUSER '
+    if bld.env.ENABLE_DISK:
+        if bld.env.TARGET_LINUX:
+            uselib += 'POLKIT '
+        uselib += 'LWEXT4 NANOMSG '
 
-    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
+    if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32:
+        uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE WINSOCK2 OLE32 DSOUND WINMM KSUSER SETUPAPI '
+    if bld.env.TARGET_LINUX:
+        uselib += 'DL '
+
+    cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create']
+    if bld.env.ENABLE_DISK and not bld.env.DISABLE_GUI:
+        cli_tools.append('dcpomatic_disk_writer')
+
+    for t in cli_tools:
+        obj = bld(features='cxx cxxprogram')
+        obj.uselib = uselib
+        obj.includes = ['..']
+        obj.use    = ['libdcpomatic2']
+        obj.source = '%s.cc' % t
+        if (bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32) and t == 'dcpomatic_disk_writer':
+            obj.source += ' ../../platform/windows/%s.rc' % t
+            # Prevent a console window opening when we start dcpomatic2_disk_writer
+            obj.env.append_value('LINKFLAGS', '-Wl,-subsystem,windows')
+        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']
-        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', 'dcpomatic_combiner', 'dcpomatic_editor']
+        if bld.env.ENABLE_DISK:
+            gui_tools.append('dcpomatic_disk')
 
     for t in gui_tools:
         obj = bld(features='cxx cxxprogram')
@@ -59,17 +72,23 @@ 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'
+        if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32:
+            obj.uselib += ' GLEW'
         obj.includes = ['..']
         obj.use    = ['libdcpomatic2', 'libdcpomatic2-wx']
         obj.source = '%s.cc' % t
-        if bld.env.TARGET_WINDOWS:
+        if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32:
             obj.source += ' ../../platform/windows/%s.rc' % t
         obj.target = t.replace('dcpomatic', 'dcpomatic2')
 
     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')