summaryrefslogtreecommitdiff
path: root/libs/surfaces
diff options
context:
space:
mode:
authorTaybin Rutkin <taybin@taybin.com>2006-06-07 14:54:12 +0000
committerTaybin Rutkin <taybin@taybin.com>2006-06-07 14:54:12 +0000
commit9fdc36bac5fa1c004751c0dd42f9ff62b9d60814 (patch)
tree34a2d26c5cadcbe5c31b424e3e50a34a4360d87b /libs/surfaces
parent55ba7c46c60d3cc9938abc34252fa930f1c883cb (diff)
Merged timbyr's win32 branch. -r 547:566.
git-svn-id: svn://localhost/ardour2/trunk@567 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces')
-rw-r--r--libs/surfaces/control_protocol/SConscript4
-rw-r--r--libs/surfaces/generic_midi/SConscript4
-rw-r--r--libs/surfaces/tranzport/SConscript3
3 files changed, 8 insertions, 3 deletions
diff --git a/libs/surfaces/control_protocol/SConscript b/libs/surfaces/control_protocol/SConscript
index eeac7bed8b..38ff95d9f0 100644
--- a/libs/surfaces/control_protocol/SConscript
+++ b/libs/surfaces/control_protocol/SConscript
@@ -36,7 +36,9 @@ cp.Merge ([
libraries['pbd3'],
libraries['midi++2'],
libraries['xml'],
- libraries['usb']
+ libraries['usb'],
+ libraries['glib2'],
+ libraries['glibmm2']
])
libardour_cp = cp.SharedLibrary('ardour_cp', cp_files)
diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript
index 97998f864f..1760eb24e9 100644
--- a/libs/surfaces/generic_midi/SConscript
+++ b/libs/surfaces/generic_midi/SConscript
@@ -37,7 +37,9 @@ genericmidi.Merge ([
libraries['pbd3'],
libraries['sigc2'],
libraries['usb'],
- libraries['xml']
+ libraries['xml'],
+ libraries['glib2'],
+ libraries['glibmm2']
])
libardour_genericmidi = genericmidi.SharedLibrary('ardour_genericmidi', genericmidi_files)
diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript
index 55dae57cc1..bbd6719aef 100644
--- a/libs/surfaces/tranzport/SConscript
+++ b/libs/surfaces/tranzport/SConscript
@@ -37,7 +37,8 @@ tranzport.Merge ([
libraries['pbd3'],
libraries['midi++2'],
libraries['xml'],
- libraries['usb']
+ libraries['usb'],
+ libraries['glib2']
])
libardour_tranzport = tranzport.SharedLibrary('ardour_tranzport', tranzport_files)