summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-11-09 22:32:55 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-11-09 22:32:55 +0000
commitb96f89355e1c69ba5a52300238310562923bc14b (patch)
treef035083f9976a1bfdd74d14870ec55c579e7d3ba
parent419f85be4edc1ec93bbd2aae8f2cd081ece689c3 (diff)
some possible build fixes for OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@10518 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--libs/ardour/wscript2
-rw-r--r--wscript6
2 files changed, 5 insertions, 3 deletions
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 5836af03ee..7716ad1fad 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -352,7 +352,7 @@ def build(bld):
obj.name = 'libardour'
obj.target = 'ardour'
obj.uselib = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
- 'JACK','SNDFILE','SAMPLERATE','LRDF','AUDIOUNIT',
+ 'JACK','SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
'OSX','BOOST','CURL','DL']
obj.use = ['libpbd','libmidipp','libevoral','libvamphost',
'libvampplugin','libtaglib','librubberband',
diff --git a/wscript b/wscript
index 97d33dd103..5d35f815d8 100644
--- a/wscript
+++ b/wscript
@@ -480,15 +480,17 @@ def configure(conf):
conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'AppKit'])
conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'CoreAudio'])
+ conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'CoreAudioKit'])
conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'CoreFoundation'])
conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'CoreServices'])
- conf.env.append_value('LINKFLAGS_OSX', ['-undefined', 'suppress' ])
+ conf.env.append_value('LINKFLAGS_OSX', ['-undefined', 'dynamic_lookup' ])
conf.env.append_value('LINKFLAGS_OSX', '-flat_namespace')
+ conf.env.append_value('LINKFLAGS_OSX', ['-bind_at_load'])
conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DAUDIOUNIT_SUPPORT")
conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DAU_STATE_SUPPORT")
- conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Audiotoolbox', '-framework', 'AudioUnit'])
+ conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Carbon', '-framework', 'Audiotoolbox', '-framework', 'AudioUnit'])
if Options.options.boost_include != '':
conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include)