Try to fix build wrt previous commit.

diff --git a/src/tools/wscript b/src/tools/wscript
index 872ea90e0429c988cb8f284562e3b09d72f62533..eafad44ec2cdb0fcb847965aba6b599bd7ff2a6a 100644 (file)
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -3,11 +3,13 @@ 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', 'dcpomatic_kdm']:
-        if conf.env.TARGET_WINDOWS:
-            conf.env.append_value('CXXFLAGS', ['-mconsole'])
-            conf.env.append_value('LINKFLAGS', ['-mconsole'])
         obj = bld(features = 'cxx cxxprogram')
         obj.uselib = 'BOOST_THREAD OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS QUICKMAIL'
         obj.includes = ['..']

diff --git a/src/wscript b/src/wscript
index a4cf349f9cf1b7b44b35306069638827e9d5b712..f3a6a8c7beab1d8480273ee29099a99e4fb6888b 100644 (file)
--- a/src/wscript
+++ b/src/wscript
@@ -1,4 +1,5 @@
 def configure(conf):
+    conf.recurse('tools')
     if not conf.env.DISABLE_GUI:
         conf.recurse('wx')