From 5e09c3e596c1b0860a996cf8f6023b43d5286a4a Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 20 Oct 2008 00:25:32 +0000 Subject: Actually use installation location variables for everything. Add ./waf configure --build which builds a (soon-to-be) relocatable independent bundle with all data/progs/libs in it (OSX bundle directory structure, should be possible to make a 'real' OSX bundle out of this...). Fix include paths to use "" and definitely build against local versions of libraries. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1689 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/wscript | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/engine/wscript') diff --git a/src/engine/wscript b/src/engine/wscript index 1b677d3e..face717a 100644 --- a/src/engine/wscript +++ b/src/engine/wscript @@ -46,7 +46,7 @@ def build(bld): obj.includes = ['.', '..', '../common', './events'] obj.name = 'libingen_engine' obj.target = 'ingen_engine' - obj.inst_dir = 'lib/ingen' + obj.inst_dir = bld.env()['LIBDIRNAME'] + 'ingen' obj.uselib_local = 'libingen_shared' core_libs = 'GLIBMM GTHREAD LV2CORE SLV2 RAUL REDLANDMM' autowaf.use_lib(bld, obj, core_libs) @@ -87,7 +87,7 @@ def build(bld): obj.includes = ['.', '..', '../common', './events', '../engine'] obj.name = 'libingen_engine_queued' obj.target = 'ingen_engine_queued' - obj.inst_dir = 'lib/ingen' + obj.inst_dir = bld.env()['LIBDIRNAME'] + 'ingen' autowaf.use_lib(bld, obj, core_libs) if bld.env()['HAVE_SOUP'] == 1: @@ -96,7 +96,7 @@ def build(bld): obj.includes = ['.', '..', '../common', './events', '../engine'] obj.name = 'libingen_engine_http' obj.target = 'ingen_engine_http' - obj.inst_dir = 'lib/ingen' + obj.inst_dir = bld.env()['LIBDIRNAME'] + 'ingen' autowaf.use_lib(bld, obj, core_libs + ' SOUP') if bld.env()['HAVE_LIBLO'] == 1: @@ -105,7 +105,7 @@ def build(bld): obj.includes = ['.', '..', '../common', './events', '../engine'] obj.name = 'libingen_engine_osc' obj.target = 'ingen_engine_osc' - obj.inst_dir = 'lib/ingen' + obj.inst_dir = bld.env()['LIBDIRNAME'] + 'ingen' autowaf.use_lib(bld, obj, core_libs + ' LIBLO') if bld.env()['HAVE_JACK'] == 1: @@ -114,7 +114,7 @@ def build(bld): obj.includes = ['.', '..', '../common', './events', '../engine'] obj.name = 'libingen_engine_jack' obj.target = 'ingen_engine_jack' - obj.inst_dir = 'lib/ingen' + obj.inst_dir = bld.env()['LIBDIRNAME'] + 'ingen' autowaf.use_lib(bld, obj, core_libs + ' JACK') # Lightweight ingen/lv2 wrapper -- cgit v1.2.1