# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1407337524 -3600
# Node ID 900557ba10599cef41e08c25add620c33a26e247
# Parent  e59651cee2f33844235502ed74f7a3f7d4141b0d# Parent  15e901d613a57eb4695964dc542542a2b0920640
Merge

diff -r e59651cee2f3 -r 900557ba1059 build/linux/Makefile.linux64
--- a/build/linux/Makefile.linux64	Wed Aug 06 16:02:25 2014 +0100
+++ b/build/linux/Makefile.linux64	Wed Aug 06 16:05:24 2014 +0100
@@ -1,9 +1,9 @@
 
-CFLAGS := -DNDEBUG -O3 -fno-exceptions -fPIC -ffast-math -msse -msse2 -mfpmath=sse -ftree-vectorize -DUSE_PTHREADS
+CFLAGS += -DNDEBUG -O3 -fno-exceptions -fPIC -ffast-math -msse -msse2 -mfpmath=sse -ftree-vectorize -DUSE_PTHREADS
 
-CXXFLAGS := $(CFLAGS)
+CXXFLAGS += $(CFLAGS)
 
-LDFLAGS	 := -shared -Lbuild/linux/amd64 -Wl,-Bstatic -lqm-dsp -lvamp-sdk -L/usr/lib/sse2/atlas -L/usr/lib/atlas/sse -llapack -lcblas -lf77blas -latlas -Wl,-z,defs -Wl,-Bdynamic -lpthread -Wl,--version-script=vamp-plugin.map
+LDFLAGS	 += -shared -Lbuild/linux/amd64 -Wl,-Bstatic -lqm-dsp -lvamp-sdk -L/usr/lib/sse2/atlas -L/usr/lib/atlas/sse -llapack -lcblas -lf77blas -latlas -Wl,-z,defs -Wl,-Bdynamic -lpthread -Wl,--version-script=vamp-plugin.map
 
 PLUGIN_EXT   := .so