From dcc94e12b12d000acbe64e938255c85291d27639 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 17 Dec 2010 03:58:59 +0000 Subject: Build machine in whole-repo compilation process. git-svn-id: http://svn.drobilla.net/lad/trunk/machina@2734 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/wscript | 2 +- src/gui/wscript | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/engine/wscript b/src/engine/wscript index e580da0..513ed22 100644 --- a/src/engine/wscript +++ b/src/engine/wscript @@ -27,7 +27,7 @@ def build(bld): obj = bld(features = 'cxx cxxshlib') obj.source = core_source obj.export_includes = ['.'] - obj.includes = '.' + obj.includes = ['.', '../..'] obj.name = 'libmachina_engine' obj.target = 'machina_engine' core_libs = 'GLIBMM GTHREAD RAUL REDLANDMM JACK' diff --git a/src/gui/wscript b/src/gui/wscript index 230114c..634971e 100644 --- a/src/gui/wscript +++ b/src/gui/wscript @@ -11,7 +11,7 @@ def build(bld): NodeView.cpp ''' - obj.includes = ['.', '..', '../engine'] + obj.includes = ['.', '../..', '../engine'] obj.export_includes = ['.'] obj.name = 'libmachina_gui' obj.target = 'machina_gui' @@ -36,7 +36,7 @@ def build(bld): obj = bld(features = 'cxx cxxprogram') obj.target = 'machina_gui' obj.source = 'main.cpp' - obj.includes = ['.', '../engine'] + obj.includes = ['.', '../..', '../engine'] obj.defines = 'VERSION="' + bld.env['MACHINA_VERSION'] + '"' obj.use = 'libmachina_engine libmachina_gui' autowaf.use_lib(bld, obj, 'GTHREAD GLIBMM REDLANDMM RAUL MACHINA EUGENE FLOWCANVAS') -- cgit v1.2.1