# HG changeset patch
# User cannam
# Date 1285759095 0
# Node ID f679cd0e1d62b14f0d8310ffa7d8831514c1e63e
# Parent  6f7fc832cb443e4b4d823e64f7a9f650ec0343d9
* Update CC makefile, remove .o file from SVN

diff -r 6f7fc832cb44 -r f679cd0e1d62 Makefile.cc-linux
--- a/Makefile.cc-linux	Fri Jul 02 04:07:18 2010 +0000
+++ b/Makefile.cc-linux	Wed Sep 29 11:18:15 2010 +0000
@@ -19,13 +19,13 @@
 
 # Edit this to list one .o file for each .cpp file in your plugin project
 #
-PLUGIN_CODE_OBJECTS = NNLSChroma.o plugins.o coskernel-20-105-3-44100-16384-80.o 
+PLUGIN_CODE_OBJECTS = NNLSChroma.o plugins.o nnls.o coskernel-20-105-3-44100-16384-80.o 
 
 # Edit this to the location of the Vamp plugin SDK, relative to your
 # project directory
 #
 VAMP_SDK_DIR = /work/vamp-plugin-sdk
-LAPACK_DIR = /work/qm-dsp/include
+#LAPACK_DIR = /work/qm-dsp/include
 QMDSP_DIR = /work/qm-dsp
 FFT_DIR = /work/qm-dsp/dsp/transforms
 NNLS_DIR = ../tsnnls/tsnnls
@@ -52,7 +52,8 @@
 CXXFLAGS = -I$(VAMP_SDK_DIR) -I$(LAPACK_DIR) -I$(FFT_DIR) -I$(NNLS_DIR) -Wall -fPIC
 PLUGIN_EXT = .so
 PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT)
-LDFLAGS = -shared -Wl,-soname=$(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a -Wl,--version-script=vamp-plugin.map $(QMDSP_DIR)/libqm-dsp.a ../tsnnls/tsnnls/.libs/libtsnnls.a -llapack-3
+#LDFLAGS = -shared -Wl,-soname=$(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a -Wl,--version-script=vamp-plugin.map $(QMDSP_DIR)/libqm-dsp.a ../tsnnls/tsnnls/.libs/libtsnnls.a -llapack-3
+LDFLAGS = -shared -Wl,-soname=$(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a -Wl,--version-script=vamp-plugin.map $(QMDSP_DIR)/libqm-dsp.a
 
 
 ##  Uncomment these for a cross-compile from Linux to Windows using MinGW:
diff -r 6f7fc832cb44 -r f679cd0e1d62 nnls.o
Binary file nnls.o has changed