summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2009-07-03 21:21:30 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2009-07-03 21:21:30 +0000
commit27c5844448558686b12153ce04e4904d17afa514 (patch)
tree26478210075ff83c250076ae28de987cef81e28f /SConstruct
parent4a33f70206d991102a8aba1bb0e2b926666d5741 (diff)
do not attempt to use scroll view for AU plugin GUIs (fixes crash-on-delete of Cocoa-based AU plugins) ; drop references in PlugUIBase to plugin/insert when it notifies us via GoingAway (fixes crash on session close) ; fix handling of AU cache info for certain plugins ; fix SConstruct missing lrdf, raptor, samplerate library definitions (\!\!\!)
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5310 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct21
1 files changed, 9 insertions, 12 deletions
diff --git a/SConstruct b/SConstruct
index 1867a3a258..b005447e04 100644
--- a/SConstruct
+++ b/SConstruct
@@ -483,18 +483,6 @@ libraries = { }
libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs')
-#libraries['sndfile'] = LibraryInfo()
-#libraries['sndfile'].ParseConfig('pkg-config --cflags --libs sndfile')
-
-libraries['lrdf'] = LibraryInfo()
-libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf')
-
-libraries['raptor'] = LibraryInfo()
-libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor')
-
-libraries['samplerate'] = LibraryInfo()
-libraries['samplerate'].ParseConfig('pkg-config --cflags --libs samplerate')
-
conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } )
if conf.CheckPKGExists ('fftw3f'):
@@ -570,6 +558,15 @@ libraries['xml'].ParseConfig('pkg-config --cflags --libs libxml-2.0')
libraries['xslt'] = LibraryInfo()
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['samplerate'] = LibraryInfo()
+libraries['samplerate'].ParseConfig('pkg-config --cflags --libs samplerate')
+
libraries['glib2'] = LibraryInfo()
libraries['glib2'].ParseConfig ('pkg-config --cflags --libs glib-2.0')
libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gobject-2.0')