diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-17 11:26:31 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-17 11:26:31 +0000 |
| commit | 8876b57b0fda1000c63f8e1f7bb8f6d5ce53c480 (patch) | |
| tree | c8c82ad228b684c64bea8c7825984ee285b8f8cb /libs | |
| parent | 1c299d5a5c493986ca4a19bd55a69281dabada86 (diff) | |
build fixes for external libsndfile, plus make ogg & FLAC required libs now
git-svn-id: svn://localhost/ardour2/branches/3.0@3737 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/SConscript | 4 | ||||
| -rw-r--r-- | libs/rubberband/SConscript | 2 | ||||
| -rw-r--r-- | libs/surfaces/control_protocol/SConscript | 2 | ||||
| -rw-r--r-- | libs/surfaces/generic_midi/SConscript | 2 | ||||
| -rw-r--r-- | libs/surfaces/mackie/SConscript | 2 | ||||
| -rw-r--r-- | libs/surfaces/tranzport/SConscript | 2 |
6 files changed, 8 insertions, 6 deletions
diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript index 3177f05976..4bdbf7d88a 100644 --- a/libs/ardour/SConscript +++ b/libs/ardour/SConscript @@ -334,7 +334,9 @@ ardour.Merge ([ libraries['raptor'], libraries['samplerate'], libraries['sigc2'], - libraries['sndfile-ardour'], + libraries['ogg'], + libraries['flac'], + libraries['sndfile'], libraries['taglib'], libraries['vamp'], libraries['vamphost'], diff --git a/libs/rubberband/SConscript b/libs/rubberband/SConscript index 82a9f1fa5c..0b684b3033 100644 --- a/libs/rubberband/SConscript +++ b/libs/rubberband/SConscript @@ -13,7 +13,7 @@ rb.Merge ([libraries['fftw3f'], libraries['fftw3'], libraries['vamp'], libraries['samplerate'], - libraries['sndfile-ardour'] + libraries['sndfile'] ]) rb.Append (CPPATH='#libs/rubberband/rubberband', CXXFLAGS="-Ilibs/rubberband/rubberband") diff --git a/libs/surfaces/control_protocol/SConscript b/libs/surfaces/control_protocol/SConscript index 2969a9e941..f45349b835 100644 --- a/libs/surfaces/control_protocol/SConscript +++ b/libs/surfaces/control_protocol/SConscript @@ -34,7 +34,7 @@ cp.Append(CPPPATH = libraries['jack'].get('CPPPATH', [])) cp.Merge ([ libraries['ardour'], - libraries['sndfile-ardour'], + libraries['sndfile'], libraries['sigc2'], libraries['pbd'], libraries['midi++2'], diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript index 253718a368..33cfd70741 100644 --- a/libs/surfaces/generic_midi/SConscript +++ b/libs/surfaces/generic_midi/SConscript @@ -35,7 +35,7 @@ genericmidi.Append(CPPPATH = libraries['jack'].get('CPPPATH', [])) genericmidi.Merge ([ libraries['ardour'], libraries['ardour_cp'], - libraries['sndfile-ardour'], + libraries['sndfile'], libraries['midi++2'], libraries['pbd'], libraries['sigc2'], diff --git a/libs/surfaces/mackie/SConscript b/libs/surfaces/mackie/SConscript index 655aba67ab..e1972d3bdb 100644 --- a/libs/surfaces/mackie/SConscript +++ b/libs/surfaces/mackie/SConscript @@ -55,7 +55,7 @@ mackie.Merge ([ libraries['xml'], libraries['glib2'], libraries['glibmm2'], - libraries['sndfile-ardour'] + libraries['sndfile'] ]) libardour_mackie = mackie.SharedLibrary('ardour_mackie', mackie_files) diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript index 9d46fe1817..ff48eb64e3 100644 --- a/libs/surfaces/tranzport/SConscript +++ b/libs/surfaces/tranzport/SConscript @@ -64,7 +64,7 @@ tranzport.Merge ([ libraries['glib2'], libraries['glibmm2'], libraries['usb'], - libraries['sndfile-ardour'] + libraries['sndfile'] ]) libardour_tranzport = tranzport.SharedLibrary('ardour_tranzport', tranzport_files) |