diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-03-15 19:42:42 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-03-15 19:42:42 +0000 |
| commit | 702411f6582073e198fb8c6ae6b0ba43b00a5840 (patch) | |
| tree | fa975802e3e0e5d776f2a06779d1831c16be49d5 /libs/ardour/SConscript | |
| parent | 6fadaae2cbc6ed0bc83136cde7536623894f819d (diff) | |
edit groups tab gets headers (carl); use sampo's SSE find_peaks code; fix build for find_peaks on x86; don't duplicate sources when embedding; use Glib::ustring for all source-related strings; fixup plugin UI automation buttons
git-svn-id: svn://localhost/ardour2/trunk@1595 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/SConscript')
| -rw-r--r-- | libs/ardour/SConscript | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript index 47015f4d07..afd5c7a2b0 100644 --- a/libs/ardour/SConscript +++ b/libs/ardour/SConscript @@ -283,19 +283,29 @@ env['BUILDERS']['SharedAsmObject'] = Builder (action = '$CXX -c -fPIC $SOURCE -o suffix = '$SHOBJSUFFIX', src_suffix = '.s', single_source = 1) +# +# handle objects that should always be compiled with -msse in their own +# special environment, which is exactly like "ardour" but unconditionally +# includes -msse +# + + +always_sse_objects = [] +sse_env = ardour.Copy() +sse_env.Append (CXXFLAGS="-msse") if env['FPU_OPTIMIZATION']: if env['DIST_TARGET'] == "i386": arch_specific_objects = env.SharedAsmObject('sse_functions.os', 'sse_functions.s') - ardour_files += ['sse_functions_xmm.cc'] + always_sse_objects += ['sse_functions_xmm.os'] if env['DIST_TARGET'] == "i686": arch_specific_objects = env.SharedAsmObject('sse_functions.os', 'sse_functions.s') - ardour_files += ['sse_functions_xmm.cc'] + always_sse_objects += ['sse_functions_xmm.os'] if env['DIST_TARGET'] == "x86_64": arch_specific_objects = env.SharedAsmObject('sse_functions_64bit.os', 'sse_functions_64bit.s') - ardour_files += ['sse_functions_xmm.cc'] + always_sse_objects += [ sse_env.SharedObject (source = 'sse_functions_xmm.cc') ] -libardour = ardour.SharedLibrary('ardour', ardour_files + extra_sources + arch_specific_objects) +libardour = ardour.SharedLibrary('ardour', ardour_files + always_sse_objects + extra_sources + arch_specific_objects) Default(libardour) |