add macro for MAC_OS_X_VERSION_MIN_REQUIRED to avoid issues on ppc builds; include...

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2976 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/SConstruct b/SConstruct
index 0113fd34669e93c5ce57873763c708354730d536..a8c1b39c3dd0b44eaffad7e5b94c92023c112daa 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -692,9 +692,9 @@ elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_6
 
 # optimization section
 if env['FPU_OPTIMIZATION']:
-    if env['DIST_TARGET'] == 'tiger':
-        opt_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS")
-        debug_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS")
+    if env['DIST_TARGET'] == 'tiger' or env['DIST_TARGET'] == 'leopard':
+        opt_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS");
+        debug_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS");
         libraries['core'].Append(LINKFLAGS= '-framework Accelerate')
     elif env['DIST_TARGET'] == 'i686' or env['DIST_TARGET'] == 'x86_64':
         opt_flags.append ("-DBUILD_SSE_OPTIMIZATIONS")
@@ -719,6 +719,9 @@ else:
 
 if env['DIST_TARGET'] in ['panther', 'tiger', 'leopard' ]:
     env['IS_OSX'] = 1
+    # force tiger or later, to avoid issues on PPC which defaults
+    # back to 10.1 if we don't tell it otherwise.
+    env.Append (CCFLAGS="-DMAC_OS_X_VERSION_MIN_REQUIRED=1040")
 else:
     env['IS_OSX'] = 0
 

diff --git a/libs/vamp-sdk/SConscript b/libs/vamp-sdk/SConscript
index a6130d3faec988f9e50a26ef3a3c7a0175faade1..abf9d86534f19ddf53fb1e444dd84ae2e2b7e8e3 100644 (file)
--- a/libs/vamp-sdk/SConscript
+++ b/libs/vamp-sdk/SConscript
@@ -22,6 +22,8 @@ vamp-sdk/RealTime.cpp
 Import('env install_prefix libraries')
 vampsdk = env.Copy()
 
+vampsdk.Merge ([libraries['fftw3'], libraries['fftw3f']])
+
 # HAVE_FFTW3 is used to help improve some performance aspects of VAMP's InputDomainAdapter
 
 vampsdk.Append (CPPATH='#libs/vamp-sdk/vamp', CXXFLAGS="-Ilibs/vamp-sdk -DHAVE_FFTW3")