# HG changeset patch
# User Chris Cannam
# Date 1407255702 -3600
# Node ID 44d3e027d59273fd1c09ff496ab312edf667b985
# Parent  d104abdcdd694e819fc4985a4334148d35bc1e5a# Parent  14ff78c4fa42f45cc20b5b37cd166bc016c50296
Merge

diff -r 14ff78c4fa42 -r 44d3e027d592 .hgsubstate
--- a/.hgsubstate	Tue Aug 05 17:20:38 2014 +0100
+++ b/.hgsubstate	Tue Aug 05 17:21:42 2014 +0100
@@ -3,13 +3,13 @@
 ca32a96c123a2c3f7548e37a8d5f4205632bdd9d mazurka-plugins
 90c2f0b597f8130c906ff3ea019480bc433d7db2 nnls-chroma
 3b37e7be34dad2fc12afced53ade57038e8ae336 pyin
-d30d68f410b65da8b5e9303e3e2c0a6245500d88 qm-vamp-plugins
+93c8ebc0c2ef4db89d8a1e2d61bca15f9ff088ff qm-vamp-plugins
 4cc12d2d64e47b72122320f5e165b0b534811f24 segmenter-vamp-plugin
-4e19c60241cbb6594dcfb5b83de6f6fdd24405b7 silvet
+8609b7315e39c62c4961bb2c1a75937faf9c24cc silvet
 b835875739968beb870e7e09132aa361656a8a30 vamp-aubio-plugins
 32407651025d8334f4d1f93dedbcd492b24bd93a vamp-libxtract-plugins
 8bc4ec815b6b695371dc9dda500191892ca5d2a7 vamp-onsetsds-plugin
 490e5d01766c5f94ad7247a6385093ce536545d4 vamp-plugin-sdk
-d6c13829a79a623f432774130d6cec86e1091155 vamp-plugin-tester
+925c8dedde9cc14e9f3eaec60ae3cfa373fe92a9 vamp-plugin-tester
 886d1071c282201f67504690ea6476417193db18 vamp-test-plugin
 4ffac7dedddfbbdffc18f74a71c05e8e0f88bd67 vampy
diff -r 14ff78c4fa42 -r 44d3e027d592 DEPENDENCIES/osx64/lib/libFLAC.a
Binary file DEPENDENCIES/osx64/lib/libFLAC.a has changed
diff -r 14ff78c4fa42 -r 44d3e027d592 DEPENDENCIES/osx64/lib/libogg.a
Binary file DEPENDENCIES/osx64/lib/libogg.a has changed
diff -r 14ff78c4fa42 -r 44d3e027d592 DEPENDENCIES/osx64/lib/libsndfile.a
Binary file DEPENDENCIES/osx64/lib/libsndfile.a has changed
diff -r 14ff78c4fa42 -r 44d3e027d592 DEPENDENCIES/osx64/lib/libvorbis.a
Binary file DEPENDENCIES/osx64/lib/libvorbis.a has changed
diff -r 14ff78c4fa42 -r 44d3e027d592 DEPENDENCIES/osx64/lib/libvorbisenc.a
Binary file DEPENDENCIES/osx64/lib/libvorbisenc.a has changed
diff -r 14ff78c4fa42 -r 44d3e027d592 DEPENDENCIES/osx64/lib/libvorbisfile.a
Binary file DEPENDENCIES/osx64/lib/libvorbisfile.a has changed
diff -r 14ff78c4fa42 -r 44d3e027d592 SCRIPTS/process.sh
--- a/SCRIPTS/process.sh	Tue Aug 05 17:20:38 2014 +0100
+++ b/SCRIPTS/process.sh	Tue Aug 05 17:21:42 2014 +0100
@@ -82,7 +82,8 @@
 	pluginext=.dylib
 	hostwrapper=
 	hostext=
-	archflags="-arch x86_64"
+	# This is a difficult choice for various reasons... have to ponder
+	archflags="-mmacosx-version-min=10.6 -arch x86_64 -arch i386"
 	;;
 esac;
 
@@ -294,6 +295,14 @@
     exit 1
 fi
 
+# Ensure we can only link statically against these
+for x in vamp-hostsdk vamp-sdk; do 
+    for y in dylib dll so; do
+	rm -f "vamp-plugin-sdk/lib$x.$y"
+	rm -f "vamp-plugin-sdk/$x.$y"
+    done
+done
+
 if ! build_or_rebuild "vamp-plugin-tester"; then 
     echo "Failed to build Vamp plugin tester!"
     exit 1