X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fwscript;h=c4ea1530fa831d0ff583ead168d29011cb6a9a16;hb=dc0667cab0bc4e578662c9a64777229ad985b396;hp=42fc90adbeac9e073f7ab101fcd5eef6c40141dd;hpb=c78ab3cbeb072f0efa2824cb39bfad5e76d53874;p=dcpomatic.git

diff --git a/src/tools/wscript b/src/tools/wscript
index 42fc90adb..c4ea1530f 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -3,20 +3,27 @@ import glob
 from waflib import Logs
 import i18n
 
+def configure(conf):
+    if conf.env.TARGET_WINDOWS:
+        conf.env.append_value('CXXFLAGS', ['-mconsole'])
+        conf.env.append_value('LINKFLAGS', ['-mconsole'])
+
 def build(bld):
-    for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test']:
+    for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm', 'dcpomatic_create']:
         obj = bld(features = 'cxx cxxprogram')
-        obj.uselib = 'BOOST_THREAD OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS'
+        obj.uselib = 'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS QUICKMAIL'
         obj.includes = ['..']
         obj.use    = ['libdcpomatic']
         obj.source = '%s.cc' % t
         obj.target = t
+        if t == 'server_test':
+            obj.install_path = None
 
     if not bld.env.DISABLE_GUI:
         for t in ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server']:
             obj = bld(features = 'cxx cxxprogram')
-            obj.uselib = 'DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML WXWIDGETS'
-            if bld.env.STATIC:
+            obj.uselib = 'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML WXWIDGETS QUICKMAIL'
+            if bld.env.BUILD_STATIC:
                 obj.uselib += ' GTK'
             obj.includes = ['..']
             obj.use    = ['libdcpomatic', 'libdcpomatic-wx']
@@ -28,7 +35,7 @@ def build(bld):
         i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic', bld)
 
 def pot(bld):
-    i18n.pot(os.path.join('src', 'tools'), 'dcpomatic.cc', 'dcpomatic')
+    i18n.pot(os.path.join('src', 'tools'), 'dcpomatic.cc dcpomatic_batch.cc', 'dcpomatic')
 
 def pot_merge(bld):
     i18n.pot_merge(os.path.join('src', 'tools'), 'dcpomatic')