summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2006-08-31 19:17:00 +0000
committerDavid Robillard <d@drobilla.net>2006-08-31 19:17:00 +0000
commit017e16c530bb1a9f186aa81893089dc79b4ddc24 (patch)
tree0b4343d96214148623cf631c4cd513026de69a6e /SConstruct
parent0c3d8378f3a3a7333f3095e67050b62022281275 (diff)
Merged with trunk R879
git-svn-id: svn://localhost/ardour2/branches/midi@880 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct14
1 files changed, 12 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct
index b6a2ed64c5..be4b6ce0b8 100644
--- a/SConstruct
+++ b/SConstruct
@@ -26,6 +26,7 @@ subst_dict = { }
opts = Options('scache.conf')
opts.AddOptions(
('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''),
+ BoolOption('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0),
BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0),
BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0),
PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'),
@@ -467,6 +468,17 @@ if conf.CheckHeader ('boost/shared_ptr.hpp', language='CXX') == 0:
libraries['boost'] = conf.Finish ()
+conf = env.Configure ()
+
+# jack_port_ensure_monitor available
+
+if conf.CheckFunc('jack_port_ensure_monitor'):
+ env.Append(CCFLAGS='-DWITH_JACK_PORT_ENSURE_MONITOR')
+else:
+ print '\nWARNING: You need at least svn revision 985 of jack for hardware monitoring to work correctly.\n'
+
+env = conf.Finish()
+
#
# Check for liblo
@@ -498,8 +510,6 @@ else:
libraries['dmalloc'] = conf.Finish ()
#
-
-#
# Audio/MIDI library (needed for MIDI, since audio is all handled via JACK)
#