diff options
| author | David Robillard <d@drobilla.net> | 2006-06-15 01:34:54 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-06-15 01:34:54 +0000 |
| commit | b5db1f624d347c8865c27fdae23bf4595be372d2 (patch) | |
| tree | 19d57731a87490c8de9773b64ee7ba76d244dc73 /SConstruct | |
| parent | a8f44b1556e68f4cf28bd52e6de7359581a1ec45 (diff) | |
Merged with trunk revision 600
git-svn-id: svn://localhost/ardour2/branches/midi@601 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 116cc24275..f6ea965e29 100644 --- a/SConstruct +++ b/SConstruct @@ -353,8 +353,8 @@ libraries = { } libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs') -libraries['sndfile'] = LibraryInfo() -libraries['sndfile'].ParseConfig('pkg-config --cflags --libs sndfile') +#libraries['sndfile'] = LibraryInfo() +#libraries['sndfile'].ParseConfig('pkg-config --cflags --libs sndfile') libraries['lrdf'] = LibraryInfo() libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf') @@ -426,6 +426,15 @@ else: libraries['usb'] = conf.Finish () # +# Check for FLAC + +libraries['flac'] = LibraryInfo () + +conf = Configure (libraries['flac']) +conf.CheckLib ('FLAC', 'FLAC__stream_decoder_new') +libraries['flac'] = conf.Finish () + +# # Check for liblo if env['LIBLO']: @@ -504,6 +513,14 @@ if env['SYSLIBS']: libraries['libgnomecanvasmm'] = LibraryInfo() libraries['libgnomecanvasmm'].ParseConfig ('pkg-config --cflags --libs libgnomecanvasmm-2.6') +# +# cannot use system one for the time being +# + + libraries['sndfile'] = LibraryInfo(LIBS='libsndfile', + LIBPATH='#libs/libsndfile', + CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src']) + # libraries['libglademm'] = LibraryInfo() # libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4') @@ -516,6 +533,7 @@ if env['SYSLIBS']: ] subdirs = [ + 'libs/libsndfile', 'libs/pbd3', 'libs/midi++2', 'libs/ardour' @@ -553,6 +571,9 @@ else: libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch', LIBPATH='#libs/soundtouch', CPPPATH=['#libs', '#libs/soundtouch']) + libraries['sndfile'] = LibraryInfo(LIBS='libsndfile', + LIBPATH='#libs/libsndfile', + CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src']) # libraries['libglademm'] = LibraryInfo(LIBS='libglademm', # LIBPATH='#libs/libglademm', # CPPPATH='#libs/libglademm') @@ -565,6 +586,7 @@ else: subdirs = [ # 'libs/cassowary', 'libs/sigc++2', + 'libs/libsndfile', 'libs/pbd3', 'libs/midi++2', 'libs/ardour' |