diff options
| -rw-r--r-- | SConstruct | 4 | ||||
| -rw-r--r-- | libs/ardour/SConscript | 2 | ||||
| -rw-r--r-- | libs/libsndfile/SConscript | 2 | ||||
| -rw-r--r-- | vst/SConscript | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index 013eb7d5e5..3959ef68ba 100644 --- a/SConstruct +++ b/SConstruct @@ -552,7 +552,7 @@ if env['SYSLIBS']: # cannot use system one for the time being # - libraries['sndfile'] = LibraryInfo(LIBS='libsndfile', + libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour', LIBPATH='#libs/libsndfile', CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src']) @@ -619,7 +619,7 @@ else: libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch', LIBPATH='#libs/soundtouch', CPPPATH=['#libs', '#libs/soundtouch']) - libraries['sndfile'] = LibraryInfo(LIBS='libsndfile', + libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour', LIBPATH='#libs/libsndfile', CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src']) # libraries['libglademm'] = LibraryInfo(LIBS='libglademm', 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) diff --git a/vst/SConscript b/vst/SConscript index 988a386de3..2a4d492f8a 100644 --- a/vst/SConscript +++ b/vst/SConscript @@ -35,7 +35,7 @@ ardour_vst.Merge ([ libraries['libgnomecanvas2'], libraries['libgnomecanvasmm'], libraries['sysmidi'], - libraries['sndfile'], + libraries['sndfile-ardour'], libraries['flac'], libraries['lrdf'], libraries['glibmm2'], |