From c335c0b23b7eda96452fc1120ba9a05fbd2d49b8 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 26 May 2006 20:34:12 +0000 Subject: [PATCH] make OS X flags OS X only git-svn-id: svn://localhost/trunk/ardour2@536 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/SConscript | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript index 6d90af8c0c..93593bad18 100644 --- a/libs/ardour/SConscript +++ b/libs/ardour/SConscript @@ -175,6 +175,11 @@ if conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/Core if conf.CheckCHeader('/System/Library/Frameworks/AudioToolbox.framework/Headers/ExtendedAudioFile.h'): ardour.Append(CXXFLAGS="-DHAVE_COREAUDIO") ardour.Append(LINKFLAGS="-framework AudioToolbox") + # + # this next line avoids issues with circular dependencies between libardour and libardour_cp. + # it is based on the (entirely reasonable) assumption that a system with CoreAudio is OS X + # + ardour.Append(LINKFLAGS='-undefined suppress -flat_namespace') extra_sources += coreaudio_files ardour = conf.Finish () @@ -215,7 +220,7 @@ if env['FPU_OPTIMIZATION']: if env['DIST_TARGET'] == "x86_64": arch_specific_objects = env.SharedAsmObject('sse_functions_64bit.os', 'sse_functions_64bit.s') -libardour = ardour.SharedLibrary('ardour', ardour_files + extra_sources + arch_specific_objects, LINKFLAGS='-undefined suppress -flat_namespace') +libardour = ardour.SharedLibrary('ardour', ardour_files + extra_sources + arch_specific_objects) Default(libardour)