From b5df20208086f2e8a895478c982c3d845b8191af Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 2 Aug 2020 01:58:44 +0200 Subject: Fix build as a subproject --- src/client/wscript | 2 +- src/gui/wscript | 4 ++-- src/server/wscript | 8 ++++---- src/wscript | 2 +- wscript | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/client/wscript b/src/client/wscript index c9d6044f..d63fb56c 100644 --- a/src/client/wscript +++ b/src/client/wscript @@ -4,7 +4,7 @@ def build(bld): obj = bld(features = 'cxx cxxshlib', cflags = ['-fvisibility=hidden'], - includes = ['../../include'], + includes = ['../../', '../../include'], export_includes = ['../../include'], name = 'libingen_client', target = 'ingen_client', diff --git a/src/gui/wscript b/src/gui/wscript index 46216adb..f2471933 100644 --- a/src/gui/wscript +++ b/src/gui/wscript @@ -43,7 +43,7 @@ def build(bld): obj = bld(features = 'cxx cxxshlib', cflags = ['-fvisibility=hidden'], export_includes = ['../../include'], - includes = ['../../include'], + includes = ['../../', '../../include'], name = 'libingen_gui', target = 'ingen_gui', install_path = '${LIBDIR}', @@ -119,7 +119,7 @@ def build(bld): obj = bld(features = 'cxx cxxshlib', cflags = ['-fvisibility=hidden'], source = 'ingen_gui_lv2.cpp', - includes = ['.', '../../include'], + includes = ['.', '../../', '../../include'], name = 'ingen_gui_lv2', target = 'ingen_gui_lv2', install_path = '${LV2DIR}/ingen.lv2/', diff --git a/src/server/wscript b/src/server/wscript index 7e9ad2d6..5fdf4583 100644 --- a/src/server/wscript +++ b/src/server/wscript @@ -58,7 +58,7 @@ def build(bld): bld(features = 'cxx cxxshlib', source = core_source, export_includes = ['../../include'], - includes = ['.', '../../include'], + includes = ['.', '../..', '../../include'], name = 'libingen_server', target = 'ingen_server', install_path = '${LIBDIR}', @@ -70,7 +70,7 @@ def build(bld): if bld.env.HAVE_JACK: bld(features = 'cxx cxxshlib', source = 'JackDriver.cpp ingen_jack.cpp', - includes = ['.', '../../include'], + includes = ['.', '../../', '../../include'], name = 'libingen_jack', target = 'ingen_jack', install_path = '${LIBDIR}', @@ -82,7 +82,7 @@ def build(bld): if bld.env.HAVE_PORTAUDIO: bld(features = 'cxx cxxshlib', source = 'PortAudioDriver.cpp ingen_portaudio.cpp', - includes = ['.', '../../include'], + includes = ['.', '../../', '../../include'], name = 'libingen_portaudio', target = 'ingen_portaudio', install_path = '${LIBDIR}', @@ -96,7 +96,7 @@ def build(bld): bld(features = 'cxx cxxshlib', source = ' ingen_lv2.cpp ', cflags = ['-fvisibility=hidden'], - includes = ['../../include'], + includes = ['../../', '../../include'], name = 'libingen_lv2', target = 'ingen_lv2', install_path = '${LV2DIR}/ingen.lv2/', diff --git a/src/wscript b/src/wscript index ba55572e..a2f576da 100644 --- a/src/wscript +++ b/src/wscript @@ -35,7 +35,7 @@ def build(bld): bld(features = 'cxx cxxshlib', source = sources, export_includes = ['../include'], - includes = ['../include'], + includes = ['.', '..', '../include'], name = 'libingen', target = 'ingen-%s' % bld.env.INGEN_MAJOR_VERSION, vnum = bld.env.INGEN_VERSION, diff --git a/wscript b/wscript index 56a1a964..707fc353 100644 --- a/wscript +++ b/wscript @@ -309,7 +309,7 @@ def build(bld): bld(features = 'c cxx cxxprogram', source = 'src/ingen/ingen.cpp', target = 'ingen', - includes = ['include'], + includes = ['.', 'include'], use = 'libingen', uselib = 'SERD SORD SRATOM RAUL LILV LV2', install_path = '${BINDIR}') @@ -320,7 +320,7 @@ def build(bld): bld(features = 'cxx cxxprogram', source = 'tests/%s.cpp' % i, target = 'tests/%s' % i, - includes = ['include'], + includes = ['.', 'include'], use = 'libingen', uselib = 'SERD SORD SRATOM RAUL LILV LV2', install_path = '', -- cgit v1.2.1