From 68e66d7f29a05e0d856323157f0226fdef7dcbd6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 8 Nov 2013 22:07:47 +0000 Subject: Try to fix build wrt previous commit. --- src/tools/wscript | 8 +++++--- src/wscript | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/tools/wscript b/src/tools/wscript index 872ea90e0..eafad44ec 100644 --- 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 a4cf349f9..f3a6a8c7b 100644 --- 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') -- cgit v1.2.3