diff options
| author | Taybin Rutkin <taybin@taybin.com> | 2006-04-25 20:23:50 +0000 |
|---|---|---|
| committer | Taybin Rutkin <taybin@taybin.com> | 2006-04-25 20:23:50 +0000 |
| commit | 49ab3aa0b3e78b635c22512b30f44b951c1401f7 (patch) | |
| tree | a1380f163eb95d1e62698a919a451cc0892c1a80 /libs/ardour/SConscript | |
| parent | bc46c6e5d44de56a8ef290484766a0f3bcfbed65 (diff) | |
All included libraries now link dynamically instead of statically.
Moved items from gtk2_ardour/utils to pbd3/convert.
Various cleanups.
git-svn-id: svn://localhost/trunk/ardour2@475 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/SConscript')
| -rw-r--r-- | libs/ardour/SConscript | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript index 3d83b3e276..d5cb439202 100644 --- a/libs/ardour/SConscript +++ b/libs/ardour/SConscript @@ -168,6 +168,7 @@ 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") extra_sources += coreaudio_files ardour = conf.Finish () @@ -199,26 +200,15 @@ env['BUILDERS']['SharedAsmObject'] = Builder (action = '$CXX -c -fPIC $SOURCE -o src_suffix = '.s', single_source = 1) -if env['DEVBUILD'] == 1: - if env['FPU_OPTIMIZATION']: - if env['DIST_TARGET'] == "i386": - arch_specific_objects = env.SharedAsmObject('sse_functions.os', 'sse_functions.s') - if env['DIST_TARGET'] == "i686": - arch_specific_objects = env.SharedAsmObject('sse_functions.os', 'sse_functions.s') - if env['DIST_TARGET'] == "x86_64": - arch_specific_objects = env.SharedAsmObject('sse_functions_64bit.os', 'sse_functions_64bit.s') +if env['FPU_OPTIMIZATION']: + if env['DIST_TARGET'] == "i386": + arch_specific_objects = env.SharedAsmObject('sse_functions.os', 'sse_functions.s') + if env['DIST_TARGET'] == "i686": + arch_specific_objects = env.SharedAsmObject('sse_functions.os', 'sse_functions.s') + 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) -else: - if env['FPU_OPTIMIZATION']: - if env['DIST_TARGET'] == "i386": - arch_specific_objects = env.StaticObject(target='sse_functions',source='sse_functions.s') - if env['DIST_TARGET'] == "i686": - arch_specific_objects = env.StaticObject(target='sse_functions',source='sse_functions.s') - if env['DIST_TARGET'] == "x86_64": - arch_specific_objects = env.StaticObject(target='sse_functions_64bit',source='sse_functions_64bit.s') - - libardour = ardour.StaticLibrary('ardour', ardour_files + extra_sources + arch_specific_objects) +libardour = ardour.SharedLibrary('ardour', ardour_files + extra_sources + arch_specific_objects) Default(libardour) |