diff options
| -rw-r--r-- | SConstruct | 14 | ||||
| -rw-r--r-- | gtk2_ardour/export_dialog.cc | 3 | ||||
| -rw-r--r-- | gtk2_ardour/utils.h | 1 | ||||
| -rw-r--r-- | libs/ardour/globals.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/mix.cc | 2 | ||||
| -rw-r--r-- | libs/flowcanvas/Doxyfile | 2 |
6 files changed, 16 insertions, 8 deletions
diff --git a/SConstruct b/SConstruct index c3a46812e3..d1470a9585 100644 --- a/SConstruct +++ b/SConstruct @@ -7,6 +7,7 @@ import shutil import glob import errno import time +from sets import Set import SCons.Node.FS SConsignFile() @@ -34,7 +35,8 @@ opts.AddOptions( BoolOption('VST', 'Compile with support for VST', 0), BoolOption('VERSIONED', 'Add version information to ardour/gtk executable name inside the build directory', 0), BoolOption('USE_SSE_EVERYWHERE', 'Ask the compiler to use x86/SSE instructions and also our hand-written x86/SSE optimizations when possible (off by default)', 0), - BoolOption('BUILD_SSE_OPTIMIZATIONS', 'Use our hand-written x86/SSE optimizations when possible (off by default)', 0) + BoolOption('BUILD_SSE_OPTIMIZATIONS', 'Use our hand-written x86/SSE optimizations when possible (off by default)', 0), + BoolOption('BUILD_VECLIB_OPTIMIZATIONS', 'Build with Apple Accelerate/vecLib optimizations when possible (off by default)', 0) ) #---------------------------------------------------------------------- @@ -52,6 +54,10 @@ class LibraryInfo(Environment): self.Append (LIBPATH = other.get ('LIBPATH', [])) self.Append (CPPPATH = other.get('CPPPATH', [])) self.Append (LINKFLAGS = other.get('LINKFLAGS', [])) + self.Replace(LIBS = list(Set(self.get('LIBS', [])))) + self.Replace(LIBPATH = list(Set(self.get('LIBPATH', [])))) + self.Replace(CPPPATH = list(Set(self.get('CPPPATH',[])))) + #doing LINKFLAGS breaks -framework env = LibraryInfo (options = opts, @@ -566,6 +572,12 @@ if config[config_arch] == 'apple': libraries['core'].Append (LIBPATH = [ '/opt/local/lib' ]) if os.path.isdir('/opt/local/include'): libraries['core'].Append (CPPPATH = [ '/opt/local/include' ]) + + if env['BUILD_VECLIB_OPTIMIZATIONS'] == 1: + opt_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS") + debug_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS") + libraries['core'].Append(LINKFLAGS= '-framework Accelerate') + if config[config_cpu] == 'powerpc': # # Apple/PowerPC optimization options diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index 97fe7feff7..c2bde2c72b 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -482,14 +482,11 @@ ExportDialog::set_state() if (nchns == 2) { if (r % 2) { rows[r][exp_cols.right] = true; -// master_selector.cell (r, 2).set_pixmap (check_pixmap, check_mask); } else { rows[r][exp_cols.left] = true; -// master_selector.cell (r, 1).set_pixmap (check_pixmap, check_mask); } } else { rows[r][exp_cols.left] = true; -// master_selector.cell (r, 1).set_pixmap (check_pixmap, check_mask); } } diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h index 3853edf7d4..916fd6b9f0 100644 --- a/gtk2_ardour/utils.h +++ b/gtk2_ardour/utils.h @@ -22,7 +22,6 @@ #define __ardour_gtk_utils_h__ #include <string> -#include <vector> #include <cmath> #include <ardour/types.h> #include <libgnomecanvasmm/line.h> diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 375068b915..238055089e 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -216,7 +216,7 @@ ARDOUR::init (AudioEngine& engine, bool use_vst, bool try_optimization, void (*s } - #elif defined (__APPLE__) +#elif defined (__APPLE__) && defined (BUILD_VECLIB_OPTIMIZATIONS) long sysVersion = 0; if (noErr != Gestalt(gestaltSystemVersion, &sysVersion)) diff --git a/libs/ardour/mix.cc b/libs/ardour/mix.cc index 6d268dfeba..cdb1bd7e66 100644 --- a/libs/ardour/mix.cc +++ b/libs/ardour/mix.cc @@ -114,7 +114,7 @@ mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, jack_nframes_t nf } } -#if defined (__APPLE__) +#if defined (__APPLE__) && defined (BUILD_VECLIB_OPTIMIZATIONS) #include <Accelerate/Accelerate.h> float diff --git a/libs/flowcanvas/Doxyfile b/libs/flowcanvas/Doxyfile index 31b6d066ac..1e6b267b9b 100644 --- a/libs/flowcanvas/Doxyfile +++ b/libs/flowcanvas/Doxyfile @@ -417,7 +417,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = src include +INPUT = src flowcanvas # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp |