diff options
| author | Ben Loftis <ben@glw.com> | 2006-10-31 21:32:04 +0000 |
|---|---|---|
| committer | Ben Loftis <ben@glw.com> | 2006-10-31 21:32:04 +0000 |
| commit | 5170c9d8d9ce0b3ea4f6b957611b9d5629cee1f3 (patch) | |
| tree | 59f4111f7ef7c9691aa1a79fbb07ab155f0c5370 /libs | |
| parent | 209aeb85ef0a8ca6bf796acfd66ab7f9b1b8f0e4 (diff) | |
change libsndfile to libsndfile-ardour to eliminate possible confusion with a system lib
git-svn-id: svn://localhost/ardour2/trunk@1041 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/SConscript | 2 | ||||
| -rw-r--r-- | libs/libsndfile/SConscript | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript index 291ad59a08..25109d660d 100644 --- a/libs/ardour/SConscript +++ b/libs/ardour/SConscript @@ -227,7 +227,7 @@ ardour = conf.Finish () ardour.Merge ([ libraries['core'], libraries['xml'], - libraries['sndfile'], + libraries['sndfile-ardour'], libraries['raptor'], libraries['lrdf'], libraries['samplerate'], diff --git a/libs/libsndfile/SConscript b/libs/libsndfile/SConscript index b1c29e5487..f8e9fc5ecb 100644 --- a/libs/libsndfile/SConscript +++ b/libs/libsndfile/SConscript @@ -25,7 +25,7 @@ if conf.CheckCHeader('/System/Library/Frameworks/CoreServices.framework/Headers/ sndfile = conf.Finish() -libsndfile = sndfile.SharedLibrary('sndfile', sndfile_files) +libsndfile = sndfile.SharedLibrary('sndfile-ardour', sndfile_files) sndfile_h = sndfile.Command('src/sndfile.h', ['src/sndfile.h.in'], 'cd libs/libsndfile && ./configure && cd -', ENV=os.environ) |