diff options
| author | Hans Fugal <hans@fugal.net> | 2006-08-04 02:18:45 +0000 |
|---|---|---|
| committer | Hans Fugal <hans@fugal.net> | 2006-08-04 02:18:45 +0000 |
| commit | 79986643c0c904f6574bb5323e2233a43a9e622e (patch) | |
| tree | 859323dbb096ac1658359881e7d11415b6588caa /libs/ardour/SConscript | |
| parent | b0b723445816bc968a6a183c6619fccc61e82859 (diff) | |
r269@gandalf: fugalh | 2006-08-03 20:18:05 -0600
Trunk merge conflicts resolved
git-svn-id: svn://localhost/ardour2/branches/undo@756 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/SConscript')
| -rw-r--r-- | libs/ardour/SConscript | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript index a1bed7aeef..44cec8638c 100644 --- a/libs/ardour/SConscript +++ b/libs/ardour/SConscript @@ -27,9 +27,11 @@ ardour.Append(POTFILE = domain + '.pot') ardour.Append(CPPPATH = '#libs/surfaces/control_protocol') ardour_files=Split(""" +diskstream.cc audio_diskstream.cc audio_library.cc audio_playlist.cc +track.cc audio_track.cc audioengine.cc audiofilesource.cc @@ -88,7 +90,6 @@ sndfile_helpers.cc sndfilesource.cc source.cc state_manager.cc -stateful.cc tempo.cc utils.cc version.cc @@ -99,7 +100,7 @@ arch_specific_objects = [ ] osc_files = [ 'osc.cc' ] vst_files = [ 'vst_plugin.cc', 'session_vst.cc' ] -coreaudio_files = [ 'coreaudiosource.cc' ] +coreaudio_files = [ 'audio_unit.cc', 'coreaudiosource.cc' ] extra_sources = [ ] if ardour['VST']: @@ -199,7 +200,7 @@ ardour.Merge ([ libraries['lrdf'], libraries['samplerate'], libraries['sigc2'], - libraries['pbd3'], + libraries['pbd'], libraries['soundtouch'], libraries['midi++2'], libraries['glib2'], @@ -209,6 +210,9 @@ ardour.Merge ([ if ardour['LIBLO']: ardour.Merge ([ libraries['lo'] ]) +if ardour['COREAUDIO']: + ardour.Merge ([ libraries['appleutility'] ]) + ardour.VersionBuild(['version.cc', 'ardour/version.h'], 'SConscript') def SharedAsmObjectEmitter(target, source, env): |