diff options
| author | David Robillard <d@drobilla.net> | 2008-10-20 00:25:32 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-10-20 00:25:32 +0000 |
| commit | 5e09c3e596c1b0860a996cf8f6023b43d5286a4a (patch) | |
| tree | 46d989730512fbaa4d72ab7e5da3e88c1e761be9 /src/module | |
| parent | 5353b8c88e3c82812e41e3411d1085e0dd481a1b (diff) | |
| download | ingen-5e09c3e596c1b0860a996cf8f6023b43d5286a4a.tar.gz ingen-5e09c3e596c1b0860a996cf8f6023b43d5286a4a.tar.bz2 ingen-5e09c3e596c1b0860a996cf8f6023b43d5286a4a.zip | |
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
Diffstat (limited to 'src/module')
| -rw-r--r-- | src/module/Module.cpp | 5 | ||||
| -rw-r--r-- | src/module/wscript | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/module/Module.cpp b/src/module/Module.cpp index 16aecb66..2f143443 100644 --- a/src/module/Module.cpp +++ b/src/module/Module.cpp @@ -22,10 +22,7 @@ #include <glibmm/miscutils.h> #include <glibmm/fileutils.h> #include "raul/SharedPtr.hpp" - -#ifndef INGEN_MODULE_DIR -#error This file expects INGEN_MODULE_DIR to be defined. -#endif +#include "config.h" using namespace std; diff --git a/src/module/wscript b/src/module/wscript index b18b39b5..ee6545cc 100644 --- a/src/module/wscript +++ b/src/module/wscript @@ -9,10 +9,10 @@ def build(bld): global.cpp ''' obj.includes = ['.', '..', '../common'] - obj.defines = 'INGEN_MODULE_DIR=\\\"' + bld.env()['PREFIX'] + 'lib/ingen\\\"' obj.name = 'libingen_module' obj.target = 'ingen_module' obj.vnum = '0.0.0' obj.uselib_local = 'libingen_shared' + obj.inst_dir = bld.env()['LIBDIRNAME'] autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM') |