LADI
/
ardour
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rework patch from #4179 to build against raptor2 

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@9878 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-07-14 22:41:36 +00:00
parent 60eabcd32b
commit 93447f494e
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
SConstruct
View File

@ -431,7 +431,6 @@ deps = \
'gtk+-2.0' : '2.8.1',
'libxml-2.0' : '2.6.0',
'samplerate' : '0.1.0',
'raptor' : '1.4.2',
'lrdf' : '0.4.0',
'jack' : '0.109.0',
'libgnomecanvas-2.0' : '2.0',
@ -487,7 +486,10 @@ libraries = { }
libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs')
conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } )
conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists,
'CheckPKGVersion' : CheckPKGVersion }
)
if conf.CheckPKGExists ('fftw3f'):
libraries['fftw3f'] = LibraryInfo()
@ -501,6 +503,22 @@ if conf.CheckPKGExists ('aubio'):
libraries['aubio'] = LibraryInfo()
libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio')
raptorOK = 0
if conf.CheckPKGExists ('raptor2'):
libraries['raptor'] = LibraryInfo()
libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor2')
raptorOK = 1
else:
if conf.CheckPKGExists ('raptor') and conf.CheckPKGVersion (pkg, '1.4.2'):
libraries['raptor'] = LibraryInfo()
libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor')
raptorOK = 1
if raptorOK == 0:
print "Ardour requires either raptor or raptor2 to be available at build time"
Exit (1)
env = conf.Finish ()
if env['FFT_ANALYSIS']:
@ -570,9 +588,6 @@ libraries['xslt'].ParseConfig('pkg-config --cflags --libs libxslt')
libraries['lrdf'] = LibraryInfo()
libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf')
libraries['raptor'] = LibraryInfo()
libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor')
libraries['sndfile'] = LibraryInfo()
libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs sndfile')