# HG changeset patch
# User Chris Cannam
# Date 1386341816 0
# Node ID 9d898889db1e291bed99f9a88b1834d04cf9fad4
# Parent  36638ec0b3792e6892976de024b8874e493ac66a
Build fixes

diff -r 36638ec0b379 -r 9d898889db1e Makefile.inc
--- a/Makefile.inc	Fri Dec 06 14:45:40 2013 +0000
+++ b/Makefile.inc	Fri Dec 06 14:56:56 2013 +0000
@@ -7,7 +7,7 @@
 CFLAGS := $(CFLAGS) 
 CXXFLAGS := -I. $(CXXFLAGS)
 
-PLUGIN := beatroot-vamp(PLUGIN_EXT)
+PLUGIN := beatroot-vamp$(PLUGIN_EXT)
 
 PLUGIN_LDFLAGS := $(LDFLAGS) $(PLUGIN_LDFLAGS)
 
@@ -16,7 +16,7 @@
 HEADERS := Agent.h AgentList.h BeatRootProcessor.h BeatRootVampPlugin.h BeatTracker.h Event.h Induction.h Peaks.h
 
 $(PLUGIN):	$(OBJECTS) $(HEADERS)
-	$(CXX) -o $@ $^ $(PLUGIN_LDFLAGS)
+	$(CXX) -o $@ $(OBJECTS) $(PLUGIN_LDFLAGS)
 
 clean:	
 	rm *.o
diff -r 36638ec0b379 -r 9d898889db1e Makefile.osx
--- a/Makefile.osx	Fri Dec 06 14:45:40 2013 +0000
+++ b/Makefile.osx	Fri Dec 06 14:56:56 2013 +0000
@@ -1,9 +1,11 @@
 
-CFLAGS := -fPIC -O3 -Wall
-CXXFLAGS := $(CFLAGS)
+CFLAGS := -fPIC -O3 -Wall -mmacosx-version-min=10.7 -arch x86_64 -arch i386
+CXXFLAGS := -I../vamp-plugin-sdk $(CFLAGS)
 
-PLUGIN_LDFLAGS := -dynamiclib -lvamp-sdk -exported_symbols_list vamp-plugin.list
+PLUGIN_LDFLAGS := -mmacosx-version-min=10.7 -arch x86_64 -arch i386 -dynamiclib -L../vamp-plugin-sdk -lvamp-sdk -exported_symbols_list vamp-plugin.list
 
 PLUGIN_EXT := .dylib
 
 include Makefile.inc
+
+