Fixed veclib support on OSX.

git-svn-id: svn://localhost/trunk/ardour2@150 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/SConstruct b/SConstruct
index c3a46812e33ce02cb5bd40811a38d06abf3fa9a2..d1470a9585c4ffffab3715337924cfd516954146 100644 (file)
--- 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 97fe7feff7f381e7a477cdb154fedd2abed6dc59..c2bde2c72b3dc3d2063c3ba0fcfadc4647cc792c 100644 (file)
--- 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 3853edf7d4cdb68bdef514e455fed81a1441b0cd..916fd6b9f05049fc4e1f20d7ed4f8ce0c50f5ff5 100644 (file)
--- 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 375068b9156e3ada8b3e8799953f02aacdef1a89..238055089e057742476244b7c2a2533a413bd559 100644 (file)
--- 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 6d268dfeba34f30d71fe9392486f745aeee3c9f9..cdb1bd7e66a634b43f7f9c6d1c492d4a38c8b2cf 100644 (file)
--- 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 31b6d066acb9877f54d3488e8348fa6f05ca891c..1e6b267b9b4c3845287d14dd62113f2cef6e7ebf 100644 (file)
--- 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