diff options
| author | David Robillard <d@drobilla.net> | 2006-08-10 01:22:45 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-08-10 01:22:45 +0000 |
| commit | ab6f1ed9bafa869648b6e94ee5186ff317b32c3e (patch) | |
| tree | d61dba7f9b6f1ae755803afc4b79bcff06a36005 /SConstruct | |
| parent | 38c7d34d8c449c7ce5f7da9575c24e60c6b31b1a (diff) | |
Merged with trunk R776
git-svn-id: svn://localhost/ardour2/branches/midi@777 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 64aad2737f..e7e43a1405 100644 --- a/SConstruct +++ b/SConstruct @@ -454,6 +454,9 @@ conf = Configure (libraries['flac']) conf.CheckLib ('FLAC', 'FLAC__stream_decoder_new', language='CXX') libraries['flac'] = conf.Finish () +# or if that fails... +#libraries['flac'] = LibraryInfo (LIBS='FLAC') + # # Check for liblo @@ -547,6 +550,10 @@ if env['SYSLIBS']: # libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas') libraries['soundtouch'] = LibraryInfo() libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') + + libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', + LIBPATH='#libs/appleutility', + CPPPATH='#libs/appleutility') coredirs = [ 'templates' @@ -561,6 +568,9 @@ if env['SYSLIBS']: if env['VST']: subdirs = ['libs/fst'] + subdirs + ['vst'] + + if env['COREAUDIO']: + subdirs = subdirs + ['libs/appleutility'] gtk_subdirs = [ # 'libs/flowcanvas', @@ -600,7 +610,10 @@ else: # libraries['libglademm'] = LibraryInfo(LIBS='libglademm', # LIBPATH='#libs/libglademm', # CPPPATH='#libs/libglademm') - + libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', + LIBPATH='#libs/appleutility', + CPPPATH='#libs/appleutility') + coredirs = [ 'libs/soundtouch', 'templates' @@ -616,6 +629,9 @@ else: if env['VST']: subdirs = ['libs/fst'] + subdirs + ['vst'] + + if env['COREAUDIO']: + subdirs = subdirs + ['libs/appleutility'] gtk_subdirs = [ 'libs/glibmm2', |