X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fwscript;h=80254b0b94c0fd572f734d9aa27c8a246e14c407;hb=fdc416faa317106d05be8fe5226ded84d8347d99;hp=fa9e9e5bd6f6d3d74627dacd6d938eac60b6cd6d;hpb=fe99d14e3047e9302e94db372923c92291016f1c;p=dcpomatic.git

diff --git a/src/tools/wscript b/src/tools/wscript
index fa9e9e5bd..80254b0b9 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -30,12 +30,18 @@ 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 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE '
+        uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE WINSOCK2 OLE32 DSOUND WINMM KSUSER '
 
-    for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create']:
+    cli_tools = []
+    if bld.env.VARIANT != "swaroop":
+        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 = ['..']
@@ -45,24 +51,30 @@ def build(bld):
         if t == 'server_test':
             obj.install_path = None
 
+    gui_tools = []
     if not bld.env.DISABLE_GUI:
-        for t in ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm']:
-            obj = bld(features='cxx cxxprogram')
-            obj.uselib = uselib
-            if bld.env.BUILD_STATIC or bld.env.TARGET_LINUX:
-                obj.uselib += ' GTK'
-            obj.uselib += ' WXWIDGETS'
-            obj.includes = ['..']
-            obj.use    = ['libdcpomatic2', 'libdcpomatic2-wx']
-            obj.source = '%s.cc' % t
-            if bld.env.TARGET_WINDOWS:
-                obj.source += ' ../../platform/windows/%s.rc' % t
-            obj.target = t.replace('dcpomatic', 'dcpomatic2')
+        if bld.env.VARIANT == 'swaroop':
+            gui_tools = ['dcpomatic_player', 'dcpomatic_playlist']
+        else:
+            gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player', 'dcpomatic_playlist']
+
+    for t in gui_tools:
+        obj = bld(features='cxx cxxprogram')
+        obj.uselib = uselib
+        if bld.env.BUILD_STATIC or bld.env.TARGET_LINUX:
+            obj.uselib += ' GTK'
+        obj.uselib += ' WXWIDGETS'
+        obj.includes = ['..']
+        obj.use    = ['libdcpomatic2', 'libdcpomatic2-wx']
+        obj.source = '%s.cc' % t
+        if bld.env.TARGET_WINDOWS:
+            obj.source += ' ../../platform/windows/%s.rc' % t
+        obj.target = t.replace('dcpomatic', 'dcpomatic2')
 
-        i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic2', 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')
+    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')