# HG changeset patch
# User Chris Cannam
# Date 1336647851 -3600
# Node ID 2760d0d074690dcb25609609bf7c755854e25f97
# Parent  767ab745c5822555327d159d5fa6158cc4e499fd# Parent  ccfdf972c04ba90c971ecb5f6d6f7af32a4ed1c2
Merge from the default branch

diff -r 767ab745c582 -r 2760d0d07469 songparts/Makefile.osx
--- a/songparts/Makefile.osx	Thu May 10 12:03:00 2012 +0100
+++ b/songparts/Makefile.osx	Thu May 10 12:04:11 2012 +0100
@@ -1,9 +1,9 @@
 
-CFLAGS := -O3 -ftree-vectorize -isysroot /Developer/SDKs/MacOSX10.7.sdk -arch i386 -arch x86_64 -I../armadillo-2.4.4/include -I../vamp-plugin-sdk -I/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/Headers/ -DUSE_PTHREADS
+CFLAGS := -O3 -ftree-vectorize -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.7.sdk -arch i386 -arch x86_64 -I../armadillo-2.4.4/include -I../vamp-plugin-sdk -I/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/Headers/ -DUSE_PTHREADS
 
 CXXFLAGS  := $(CFLAGS)
 
-LDFLAGS	  := -isysroot /Developer/SDKs/MacOSX10.7.sdk -arch i386 -arch x86_64 -lqm-dsp ../vamp-plugin-sdk/libvamp-sdk.a -dynamiclib -framework Accelerate -lpthread -install_name qm-vamp-plugins.dylib
+LDFLAGS	  := -isysroot /Developer/SDKs/MacOSX10.7.sdk -mmacosx-version-min=10.5 -arch i386 -arch x86_64 -lqm-dsp ../vamp-plugin-sdk/libvamp-sdk.a -dynamiclib -framework Accelerate -lpthread -install_name qm-vamp-plugins.dylib
 
 PLUGIN_EXT   := .dylib
 
diff -r 767ab745c582 -r 2760d0d07469 songparts/SongParts.cpp
--- a/songparts/SongParts.cpp	Thu May 10 12:03:00 2012 +0100
+++ b/songparts/SongParts.cpp	Thu May 10 12:04:11 2012 +0100
@@ -58,6 +58,7 @@
 }Part;
 
 
+
 /* ------------------------------------ */
 /* ----- BEAT DETECTOR CLASS ---------- */
 /* ------------------------------------ */