summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2015-10-18 23:19:52 +0200
committerRobin Gareus <robin@gareus.org>2015-10-18 23:19:52 +0200
commit6ff50d21403a81ebeb0d371ee2a41f5dcd7fb17f (patch)
tree336335a0b3e759d21eb84bc8b23ffef0e997f06a
parentd17b73e989b5825cb3caeab7321f3663adb6839d (diff)
fix OS X system detection (amend 66704ee)
-rw-r--r--libs/appleutility/wscript9
-rw-r--r--wscript1
2 files changed, 5 insertions, 5 deletions
diff --git a/libs/appleutility/wscript b/libs/appleutility/wscript
index cf596b29a6..63a1a1a465 100644
--- a/libs/appleutility/wscript
+++ b/libs/appleutility/wscript
@@ -26,11 +26,10 @@ def options(opt):
def configure(conf):
autowaf.configure(conf)
- if not conf.env['build_target'] in ['panther', 'tiger', 'leopard']:
- if not (Options.options.ppc and conf.env['build_target'] == 'snowleopard'):
- conf.env.append_value ('CFLAGS', '-DCOREAUDIO105')
- conf.env.append_value ('CXXFLAGS', '-DCOREAUDIO105')
- conf.define ('COREAUDIO105', 1)
+ if conf.env['build_target'] in ['panther', 'tiger', 'leopard'] or (Options.options.ppc and conf.env['build_target'] == 'snowleopard'):
+ conf.env.append_value ('CFLAGS', '-DCOREAUDIO105')
+ conf.env.append_value ('CXXFLAGS', '-DCOREAUDIO105')
+ conf.define ('COREAUDIO105', 1)
def build(bld):
obj = bld(features = 'cxx cxxshlib')
diff --git a/wscript b/wscript
index 14d660276d..4319de317b 100644
--- a/wscript
+++ b/wscript
@@ -1103,6 +1103,7 @@ const char* const ardour_config_info = "\\n\\
write_config_text('Free/Demo copy', conf.is_defined('FREEBIE'))
write_config_text('Build target', conf.env['build_target'])
write_config_text('CoreAudio', conf.is_defined('HAVE_COREAUDIO'))
+ write_config_text('CoreAudio 10.5 compat', conf.is_defined('COREAUDIO105'))
write_config_text('CoreAudio/Midi Backend',conf.env['BUILD_CORECRAPPITA'])
write_config_text('Debug RT allocations', conf.is_defined('DEBUG_RT_ALLOC'))
write_config_text('Debug Symbols', conf.is_defined('debug_symbols') or conf.env['DEBUG'])