build changes from robin gareus for OS X, changing AU support to be used appropriately rather than GTKOSX
git-svn-id: svn://localhost/ardour2/branches/3.0@10869 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
d05a09991a
commit
07b4626ea5
|
@ -313,13 +313,13 @@ PluginUIWindow::create_lxvst_editor(boost::shared_ptr<PluginInsert>)
|
|||
}
|
||||
|
||||
bool
|
||||
#ifdef GTKOSX
|
||||
#ifdef AUDIOUNIT_SUPPORT
|
||||
PluginUIWindow::create_audiounit_editor (boost::shared_ptr<PluginInsert> insert)
|
||||
#else
|
||||
PluginUIWindow::create_audiounit_editor (boost::shared_ptr<PluginInsert>)
|
||||
#endif
|
||||
{
|
||||
#ifndef GTKOSX
|
||||
#ifndef AUDIOUNIT_SUPPORT
|
||||
return false;
|
||||
#else
|
||||
VBox* box;
|
||||
|
@ -340,7 +340,7 @@ PluginUIWindow::app_activated (bool yn)
|
|||
PluginUIWindow::app_activated (bool)
|
||||
#endif
|
||||
{
|
||||
#ifdef GTKOSX
|
||||
#ifdef AUDIOUNIT_SUPPORT
|
||||
if (_pluginui) {
|
||||
if (yn) {
|
||||
if (was_visible) {
|
||||
|
|
|
@ -411,9 +411,12 @@ def build(bld):
|
|||
|
||||
if bld.is_defined('HAVE_COREAUDIO'):
|
||||
TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc']
|
||||
obj.source += [ 'cocoacarbon.mm', 'au_pluginui.mm' ]
|
||||
obj.source += [ 'cocoacarbon.mm' ]
|
||||
obj.use += ' libappleutility '
|
||||
|
||||
if bld.is_defined('AUDIOUNIT_SUPPORT'):
|
||||
obj.source += [ 'au_pluginui.mm' ]
|
||||
|
||||
if bld.is_defined('WINDOWS_VST_SUPPORT'):
|
||||
# If we require VST support we build a stub main() and the FST library
|
||||
# here using winegcc, and link it to the GTK front-end library
|
||||
|
|
|
@ -398,6 +398,8 @@ def build(bld):
|
|||
if bld.is_defined('HAVE_COREAUDIO'):
|
||||
obj.source += [ 'coreaudiosource.cc', 'caimportable.cc' ]
|
||||
obj.use += ['libappleutility']
|
||||
|
||||
if bld.is_defined('AUDIOUNIT_SUPPORT'):
|
||||
obj.source += [ 'audio_unit.cc' ]
|
||||
|
||||
if Options.options.fpu_optimization:
|
||||
|
|
Loading…
Reference in New Issue