diff options
Diffstat (limited to 'libs/backends')
| -rw-r--r-- | libs/backends/coreaudio/coreaudio_backend.cc | 5 | ||||
| -rw-r--r-- | libs/backends/coreaudio/wscript | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/libs/backends/coreaudio/coreaudio_backend.cc b/libs/backends/coreaudio/coreaudio_backend.cc index f4add45ac9..fd03ddea50 100644 --- a/libs/backends/coreaudio/coreaudio_backend.cc +++ b/libs/backends/coreaudio/coreaudio_backend.cc @@ -95,8 +95,7 @@ CoreAudioBackend::~CoreAudioBackend () std::string CoreAudioBackend::name () const { - // XXX avoid name -conflict w/waves - return X_("CoreAudio2"); + return X_("CoreAudio"); } bool @@ -1514,7 +1513,7 @@ static bool already_configured (); static bool available (); static ARDOUR::AudioBackendInfo _descriptor = { - "CoreAudio2", + "CoreAudio", instantiate, deinstantiate, backend_factory, diff --git a/libs/backends/coreaudio/wscript b/libs/backends/coreaudio/wscript index 99d9e66f69..a4f9ee69f3 100644 --- a/libs/backends/coreaudio/wscript +++ b/libs/backends/coreaudio/wscript @@ -1,5 +1,6 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf +from waflib import Options import os import sys import re @@ -15,6 +16,8 @@ def options(opt): def configure(conf): autowaf.configure(conf) + if Options.options.ppc: + conf.env['build_arch'] = "ppc" def build(bld): obj = bld(features = 'cxx cxxshlib') @@ -32,5 +35,8 @@ def build(bld): 'ARDOURBACKEND_DLL_EXPORTS', 'COREAUDIO_108' ] - # OSX 10.6 or later - obj.defines += ['COREAUDIO_108'] + # use new coreaudio API (the old one was deprecated in 10.6, yet still works) + # only use with OSX intel 10.6 or later, but for all OSX/PPC (<= 10.6) + if not bld.env['build_target'] in ['panther', 'tiger', 'leopard']: + if not (bld.env['build_target'] == 'snow leopard' and conf.env['build_arch'] == "ppc"): + obj.defines += ['COREAUDIO_108'] |