diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-02 20:03:03 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-02 20:03:03 +0000 |
| commit | 07b4626ea5565d0c245c4a233a07257fc285ae64 (patch) | |
| tree | fa32029e01f94b4ce6e4e3b4e1fb6039aa2c74e2 | |
| parent | d05a09991aa16b50f849aceb3524f859941751b1 (diff) | |
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
| -rw-r--r-- | gtk2_ardour/plugin_ui.cc | 6 | ||||
| -rw-r--r-- | gtk2_ardour/wscript | 5 | ||||
| -rw-r--r-- | libs/ardour/wscript | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc index c71fd1980d..9774d3dc46 100644 --- a/gtk2_ardour/plugin_ui.cc +++ b/gtk2_ardour/plugin_ui.cc @@ -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) { diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 3a5a301a13..358f17854f 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -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 diff --git a/libs/ardour/wscript b/libs/ardour/wscript index ee5f209129..dfdb4a47ca 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -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: |