summaryrefslogtreecommitdiff
path: root/libs/surfaces
diff options
context:
space:
mode:
authorTaybin Rutkin <taybin@taybin.com>2006-04-25 20:23:50 +0000
committerTaybin Rutkin <taybin@taybin.com>2006-04-25 20:23:50 +0000
commit49ab3aa0b3e78b635c22512b30f44b951c1401f7 (patch)
treea1380f163eb95d1e62698a919a451cc0892c1a80 /libs/surfaces
parentbc46c6e5d44de56a8ef290484766a0f3bcfbed65 (diff)
All included libraries now link dynamically instead of statically.
Moved items from gtk2_ardour/utils to pbd3/convert. Various cleanups. git-svn-id: svn://localhost/trunk/ardour2@475 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces')
-rw-r--r--libs/surfaces/generic_midi/SConscript9
-rw-r--r--libs/surfaces/tranzport/.cvsignore1
2 files changed, 5 insertions, 5 deletions
diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript
index 7e6ef1cf85..29607ec261 100644
--- a/libs/surfaces/generic_midi/SConscript
+++ b/libs/surfaces/generic_midi/SConscript
@@ -29,12 +29,11 @@ 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['ardour'].get ('CPPPATH', []))
-genericmidi.Append(CPPPATH=libraries['sigc2'].get ('CPPPATH', []))
-genericmidi.Append(CPPPATH=libraries['pbd3'].get ('CPPPATH', []))
-genericmidi.Append(CPPPATH=libraries['midi++2'].get ('CPPPATH', []))
-
genericmidi.Merge ([
+ libraries['ardour'],
+ libraries['midi++2'],
+ libraries['pbd3'],
+ libraries['sigc2'],
libraries['usb'],
libraries['xml']
])
diff --git a/libs/surfaces/tranzport/.cvsignore b/libs/surfaces/tranzport/.cvsignore
new file mode 100644
index 0000000000..1edeb79fd1
--- /dev/null
+++ b/libs/surfaces/tranzport/.cvsignore
@@ -0,0 +1 @@
+*.os