diff options
| -rw-r--r-- | SConstruct | 8 | ||||
| -rw-r--r-- | libs/vamp-plugins/SConscript | 16 |
2 files changed, 7 insertions, 17 deletions
diff --git a/SConstruct b/SConstruct index 31de55a2cc..eda56354a2 100644 --- a/SConstruct +++ b/SConstruct @@ -61,7 +61,7 @@ opts.AddVariables( BoolVariable('GPROFILE', 'Compile with support for gprofile (Developers only)', 0), BoolVariable('FREEDESKTOP', 'Install MIME type, icons and .desktop file as per the freedesktop.org spec (requires xdg-utils and shared-mime-info). "scons uninstall" removes associations in desktop database', 0), BoolVariable('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1), - BoolVariable('AUBIO', "Use Paul Brossier's aubio library for feature detection (if available)", 1), + BoolVariable('AUBIO', "Use Paul Brossier's aubio library for feature detection", 1), BoolVariable('AUSTATE', "Build with support for AU settings & presets saving/loading", 0) ) @@ -435,7 +435,8 @@ deps = \ 'lrdf' : '0.4.0', 'jack' : '0.109.0', 'libgnomecanvas-2.0' : '2.0', - 'sndfile' : '1.0.18' + 'sndfile' : '1.0.18', + 'aubio' : '0.3.0' } def DependenciesRequiredMessage(): @@ -499,9 +500,6 @@ if conf.CheckPKGExists ('fftw3'): if conf.CheckPKGExists ('aubio'): libraries['aubio'] = LibraryInfo() libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio') - env['AUBIO'] = 1 -else: - env['AUBIO'] = 0 env = conf.Finish () diff --git a/libs/vamp-plugins/SConscript b/libs/vamp-plugins/SConscript index fd86c09eca..20cdb33d44 100644 --- a/libs/vamp-plugins/SConscript +++ b/libs/vamp-plugins/SConscript @@ -10,9 +10,6 @@ AmplitudeFollower.cpp PercussionOnsetDetector.cpp SpectralCentroid.cpp ZeroCrossing.cpp -""") - -aubio_files = Split (""" Onset.cpp """) @@ -21,18 +18,13 @@ vampplugs = env.Clone() vampplugs.Append (CPPATH='#libs/vamp-sdk/vamp', CXXFLAGS="-Ilibs/vamp-sdk") vampplugs.Merge ([libraries['vamp'], - libraries['vamphost'] + libraries['vamphost'], + libraries['aubio'], + libraries['fftw3f'] ]) sources = plugin_files -if vampplugs['AUBIO']: - sources += aubio_files - vampplugs.Merge ([libraries['aubio']]) - vampplugs.Merge ([libraries['fftw3f']]) -else: - print 'WARNING: some VAMP plugins will not be built because this machine has no AUBIO support' - libvampplugins = vampplugs.SharedLibrary('ardourvampplugins', sources) Default(libvampplugins) @@ -41,5 +33,5 @@ env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ar env.Alias('tarball', env.Distribute (env['DISTTREE'], [ 'SConscript' ] + - plugin_files + aubio_files + + plugin_files + glob.glob('*.h'))) |