diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 21:27:39 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 21:27:39 +0000 |
| commit | c86210a9d5bdb7b36ad58552a1f99f53d48781b3 (patch) | |
| tree | 6ab06935a1e2bc4ef6a4448dd01b09f5b2628c66 /libs/surfaces | |
| parent | 68e943265edf04e63a8e8b8f62bab20f99d9c637 (diff) | |
merge 2.0-ongoing into 3.0 @ 3581 - 3710
git-svn-id: svn://localhost/ardour2/branches/3.0@3712 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/control_protocol/SConscript | 1 | ||||
| -rw-r--r-- | libs/surfaces/generic_midi/SConscript | 1 | ||||
| -rw-r--r-- | libs/surfaces/mackie/SConscript | 1 | ||||
| -rw-r--r-- | libs/surfaces/tranzport/SConscript | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/libs/surfaces/control_protocol/SConscript b/libs/surfaces/control_protocol/SConscript index 22cb1f4961..2969a9e941 100644 --- a/libs/surfaces/control_protocol/SConscript +++ b/libs/surfaces/control_protocol/SConscript @@ -30,6 +30,7 @@ cp.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE") cp.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"") cp.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"") cp.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"") +cp.Append(CPPPATH = libraries['jack'].get('CPPPATH', [])) cp.Merge ([ libraries['ardour'], diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript index 833f06923a..253718a368 100644 --- a/libs/surfaces/generic_midi/SConscript +++ b/libs/surfaces/generic_midi/SConscript @@ -30,6 +30,7 @@ genericmidi.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOUR genericmidi.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"") genericmidi.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"") genericmidi.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"") +genericmidi.Append(CPPPATH = libraries['jack'].get('CPPPATH', [])) genericmidi.Merge ([ libraries['ardour'], diff --git a/libs/surfaces/mackie/SConscript b/libs/surfaces/mackie/SConscript index 45ce63d3cd..655aba67ab 100644 --- a/libs/surfaces/mackie/SConscript +++ b/libs/surfaces/mackie/SConscript @@ -44,6 +44,7 @@ mackie.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE") mackie.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"") mackie.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"") mackie.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"") +mackie.Append(CPPPATH = libraries['jack'].get('CPPPATH', [])) mackie.Merge ([ libraries['ardour'], diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript index fddd66c95d..9d46fe1817 100644 --- a/libs/surfaces/tranzport/SConscript +++ b/libs/surfaces/tranzport/SConscript @@ -52,6 +52,7 @@ tranzport.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"") # tranzport.Append(CXXFLAGS="-DHAVE_TRANZPORT_KERNEL_DRIVER=1") #merge more into tranzport files for the right io lib +tranzport.Append(CPPPATH = libraries['jack'].get('CPPPATH', [])) tranzport.Merge ([ libraries['ardour'], |