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
This commit is contained in:
parent
209aeb85ef
commit
5170c9d8d9
@ -552,7 +552,7 @@ if env['SYSLIBS']:
|
|||||||
# cannot use system one for the time being
|
# cannot use system one for the time being
|
||||||
#
|
#
|
||||||
|
|
||||||
libraries['sndfile'] = LibraryInfo(LIBS='libsndfile',
|
libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour',
|
||||||
LIBPATH='#libs/libsndfile',
|
LIBPATH='#libs/libsndfile',
|
||||||
CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src'])
|
CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src'])
|
||||||
|
|
||||||
@ -619,7 +619,7 @@ else:
|
|||||||
libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch',
|
libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch',
|
||||||
LIBPATH='#libs/soundtouch',
|
LIBPATH='#libs/soundtouch',
|
||||||
CPPPATH=['#libs', '#libs/soundtouch'])
|
CPPPATH=['#libs', '#libs/soundtouch'])
|
||||||
libraries['sndfile'] = LibraryInfo(LIBS='libsndfile',
|
libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour',
|
||||||
LIBPATH='#libs/libsndfile',
|
LIBPATH='#libs/libsndfile',
|
||||||
CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src'])
|
CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src'])
|
||||||
# libraries['libglademm'] = LibraryInfo(LIBS='libglademm',
|
# libraries['libglademm'] = LibraryInfo(LIBS='libglademm',
|
||||||
|
@ -227,7 +227,7 @@ ardour = conf.Finish ()
|
|||||||
ardour.Merge ([
|
ardour.Merge ([
|
||||||
libraries['core'],
|
libraries['core'],
|
||||||
libraries['xml'],
|
libraries['xml'],
|
||||||
libraries['sndfile'],
|
libraries['sndfile-ardour'],
|
||||||
libraries['raptor'],
|
libraries['raptor'],
|
||||||
libraries['lrdf'],
|
libraries['lrdf'],
|
||||||
libraries['samplerate'],
|
libraries['samplerate'],
|
||||||
|
@ -25,7 +25,7 @@ if conf.CheckCHeader('/System/Library/Frameworks/CoreServices.framework/Headers/
|
|||||||
|
|
||||||
sndfile = conf.Finish()
|
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)
|
sndfile_h = sndfile.Command('src/sndfile.h', ['src/sndfile.h.in'], 'cd libs/libsndfile && ./configure && cd -', ENV=os.environ)
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ ardour_vst.Merge ([
|
|||||||
libraries['libgnomecanvas2'],
|
libraries['libgnomecanvas2'],
|
||||||
libraries['libgnomecanvasmm'],
|
libraries['libgnomecanvasmm'],
|
||||||
libraries['sysmidi'],
|
libraries['sysmidi'],
|
||||||
libraries['sndfile'],
|
libraries['sndfile-ardour'],
|
||||||
libraries['flac'],
|
libraries['flac'],
|
||||||
libraries['lrdf'],
|
libraries['lrdf'],
|
||||||
libraries['glibmm2'],
|
libraries['glibmm2'],
|
||||||
|
Loading…
Reference in New Issue
Block a user