make AUBIO a non-optional dependency
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@9043 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
6ff201fab2
commit
9e9fe1dfeb
|
@ -61,7 +61,7 @@ opts.AddVariables(
|
||||||
BoolVariable('GPROFILE', 'Compile with support for gprofile (Developers only)', 0),
|
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('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('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)
|
BoolVariable('AUSTATE', "Build with support for AU settings & presets saving/loading", 0)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -435,7 +435,8 @@ deps = \
|
||||||
'lrdf' : '0.4.0',
|
'lrdf' : '0.4.0',
|
||||||
'jack' : '0.109.0',
|
'jack' : '0.109.0',
|
||||||
'libgnomecanvas-2.0' : '2.0',
|
'libgnomecanvas-2.0' : '2.0',
|
||||||
'sndfile' : '1.0.18'
|
'sndfile' : '1.0.18',
|
||||||
|
'aubio' : '0.3.0'
|
||||||
}
|
}
|
||||||
|
|
||||||
def DependenciesRequiredMessage():
|
def DependenciesRequiredMessage():
|
||||||
|
@ -499,9 +500,6 @@ if conf.CheckPKGExists ('fftw3'):
|
||||||
if conf.CheckPKGExists ('aubio'):
|
if conf.CheckPKGExists ('aubio'):
|
||||||
libraries['aubio'] = LibraryInfo()
|
libraries['aubio'] = LibraryInfo()
|
||||||
libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio')
|
libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio')
|
||||||
env['AUBIO'] = 1
|
|
||||||
else:
|
|
||||||
env['AUBIO'] = 0
|
|
||||||
|
|
||||||
env = conf.Finish ()
|
env = conf.Finish ()
|
||||||
|
|
||||||
|
|
|
@ -10,9 +10,6 @@ AmplitudeFollower.cpp
|
||||||
PercussionOnsetDetector.cpp
|
PercussionOnsetDetector.cpp
|
||||||
SpectralCentroid.cpp
|
SpectralCentroid.cpp
|
||||||
ZeroCrossing.cpp
|
ZeroCrossing.cpp
|
||||||
""")
|
|
||||||
|
|
||||||
aubio_files = Split ("""
|
|
||||||
Onset.cpp
|
Onset.cpp
|
||||||
""")
|
""")
|
||||||
|
|
||||||
|
@ -21,18 +18,13 @@ vampplugs = env.Clone()
|
||||||
|
|
||||||
vampplugs.Append (CPPATH='#libs/vamp-sdk/vamp', CXXFLAGS="-Ilibs/vamp-sdk")
|
vampplugs.Append (CPPATH='#libs/vamp-sdk/vamp', CXXFLAGS="-Ilibs/vamp-sdk")
|
||||||
vampplugs.Merge ([libraries['vamp'],
|
vampplugs.Merge ([libraries['vamp'],
|
||||||
libraries['vamphost']
|
libraries['vamphost'],
|
||||||
|
libraries['aubio'],
|
||||||
|
libraries['fftw3f']
|
||||||
])
|
])
|
||||||
|
|
||||||
sources = plugin_files
|
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)
|
libvampplugins = vampplugs.SharedLibrary('ardourvampplugins', sources)
|
||||||
|
|
||||||
Default(libvampplugins)
|
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'],
|
env.Alias('tarball', env.Distribute (env['DISTTREE'],
|
||||||
[ 'SConscript' ] +
|
[ 'SConscript' ] +
|
||||||
plugin_files + aubio_files +
|
plugin_files +
|
||||||
glob.glob('*.h')))
|
glob.glob('*.h')))
|
||||||
|
|
Loading…
Reference in New Issue