Mercurial > hg > nnls-chroma

changeset 31:e2b8b2a1cd9b matthiasm-plugin

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* More tidying
author Chris Cannam
date Thu, 21 Oct 2010 19:23:02 +0100
parents 690bd9148467
children 9fe53dd1c41a
files Makefile.cc-linux Makefile.jackal Makefile.octave Makefile.skeleton try
diffstat 4 files changed, 47 insertions(+), 295 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.cc-linux	Thu Oct 21 16:34:58 2010 +0100
+++ b/Makefile.cc-linux	Thu Oct 21 19:23:02 2010 +0100
@@ -1,49 +1,47 @@
-
-##  Skeleton Makefile for Vamp plugin builds using command-line tools.
-##
-##  Rename this to Makefile, and edit as appropriate.
-##  This Makefile WILL NOT WORK until you have edited it as described
-##  below -- the Makefile as supplied does nothing useful at all!
-##
-##  Various sets of options are provided, commented out -- just uncomment
-##  (remove the '#' characters for) the set that most closely resembles
-##  your own situation, and adjust to taste.  Then run "make".
-##
-##  (For Windows builds using MS Visual Studio, start instead with the
-##  VampExamplePlugins project found in the build directory of the SDK.)
-
-
-# Edit this to the base name of your plugin library
-#
-PLUGIN_LIBRARY_NAME = matthiasm
-
-# Edit this to list one .o file for each .cpp file in your plugin project
-#
-PLUGIN_CODE_OBJECTS = chromamethods.o NNLSChroma.o plugins.o nnls.o
-
-# Edit this to the location of the Vamp plugin SDK, relative to your
-# project directory
-#
-VAMP_SDK_DIR = /work/vamp-plugin-sdk
-QMDSP_DIR = /work/qm-dsp
-NNLS_DIR = ../tsnnls/tsnnls
-
-
-CFLAGS = -I$(VAMP_SDK_DIR) -I$(LAPACK_DIR) -I$(NNLS_DIR) -Wall -fPIC
-CXXFLAGS = -I$(VAMP_SDK_DIR) -I$(LAPACK_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
-
-
-
-
-##  All of the above
-
-$(PLUGIN): $(PLUGIN_CODE_OBJECTS)
-	   $(CXX) -o $@ $^ $(LDFLAGS)
-
-clean:
-	rm -f *.o
-
+
+##  Skeleton Makefile for Vamp plugin builds using command-line tools.
+##
+##  Rename this to Makefile, and edit as appropriate.
+##  This Makefile WILL NOT WORK until you have edited it as described
+##  below -- the Makefile as supplied does nothing useful at all!
+##
+##  Various sets of options are provided, commented out -- just uncomment
+##  (remove the '#' characters for) the set that most closely resembles
+##  your own situation, and adjust to taste.  Then run "make".
+##
+##  (For Windows builds using MS Visual Studio, start instead with the
+##  VampExamplePlugins project found in the build directory of the SDK.)
+
+
+# Edit this to the base name of your plugin library
+#
+PLUGIN_LIBRARY_NAME = matthiasm
+
+# Edit this to list one .o file for each .cpp file in your plugin project
+#
+PLUGIN_CODE_OBJECTS = chromamethods.o NNLSChroma.o plugins.o nnls.o
+
+# Edit this to the location of the Vamp plugin SDK, relative to your
+# project directory
+#
+VAMP_SDK_DIR = /work/vamp-plugin-sdk
+QMDSP_DIR = /work/qm-dsp
+
+CFLAGS = -I$(VAMP_SDK_DIR) -Wall -fPIC
+CXXFLAGS = -I$(VAMP_SDK_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
+
+
+
+
+##  All of the above
+
+$(PLUGIN): $(PLUGIN_CODE_OBJECTS)
+	   $(CXX) -o $@ $^ $(LDFLAGS)
+
+clean:
+	rm -f *.o
+
--- a/Makefile.jackal	Thu Oct 21 16:34:58 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-
-##  Skeleton Makefile for Vamp plugin builds using command-line tools.
-##
-##  Rename this to Makefile, and edit as appropriate.
-##  This Makefile WILL NOT WORK until you have edited it as described
-##  below -- the Makefile as supplied does nothing useful at all!
-##
-##  Various sets of options are provided, commented out -- just uncomment
-##  (remove the '#' characters for) the set that most closely resembles
-##  your own situation, and adjust to taste.  Then run "make".
-##
-##  (For Windows builds using MS Visual Studio, start instead with the
-##  VampExamplePlugins project found in the build directory of the SDK.)
-
-
-# Edit this to the base name of your plugin library
-#
-PLUGIN_LIBRARY_NAME = matthiasm
-
-# 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 
-
-# Edit this to the location of the Vamp plugin SDK, relative to your
-# project directory
-#
-VAMP_SDK_DIR = ../vamp-plugin-sdk
-#LAPACK_DIR = ../qm-dsp/include
-#QMDSP_DIR = ../qm-dsp/build/osx/20091028
-FFT_DIR = ../qm-dsp/dsp/transforms
-NNLS_DIR = ../tsnnls/tsnnls
-
-LAPACK_DIR=./lapack-linux-amd64
-
-
-##  Uncomment these for an OS/X native build using command-line tools:
-#CXXFLAGS = -I$(VAMP_SDK_DIR) -I$(LAPACK_DIR) -I$(FFT_DIR) -I$(NNLS_DIR) -Wall -fPIC -g
-#PLUGIN_EXT = .dylib
-#PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT)
-#LDFLAGS = -dynamiclib -install_name $(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a $(QMDSP_DIR)/libqm-dsp.a 
-#../tsnnls/tsnnls/.libs/libtsnnls.a -exported_symbols_list vamp-plugin.list -framework Accelerate
-
-
-##  Uncomment these for an OS/X universal binary using command-line tools:
-
-# CXXFLAGS = -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -I$(VAMP_SDK_DIR) -Wall -fPIC
-# PLUGIN_EXT = .dylib
-# PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT)
-# LDFLAGS = -dynamiclib -install_name $(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a ./libtsnnls.a -exported_symbols_list vamp-plugin.list 
-
-##  Uncomment these for Linux using the standard tools:
-
-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 ./libtsnnls.a -L$(LAPACK_DIR) -llapack -lf77blas -lcblas -latlas -Wl,--version-script=vamp-plugin.map
-
-
-##  Uncomment these for a cross-compile from Linux to Windows using MinGW:
-
-# CXX = i586-mingw32msvc-g++
-# CXXFLAGS = -I$(VAMP_SDK_DIR) -Wall 
-# PLUGIN_EXT = .dll
-# PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT)
-# LDFLAGS = --static-libgcc -Wl,-soname=$(PLUGIN) -shared $(VAMP_SDK_DIR)/libvamp-sdk.a
-
-
-##  Uncomment these for OpenSolaris using SunStudio compiler and GNU make:
-
-# CXX = CC
-# CXXFLAGS = -G -I$(VAMP_SDK_DIR) +w -KPIC
-# PLUGIN_EXT = .so
-# PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT)
-# LDFLAGS = -G -h$(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a -Qoption ld -Mvamp-plugin.map
-
-
-
-##  All of the above
-
-$(PLUGIN): $(PLUGIN_CODE_OBJECTS)
-	   $(CXX) -o $@ $^ $(LDFLAGS)
-
-clean:
-	rm -f *.o
-
--- a/Makefile.octave	Thu Oct 21 16:34:58 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-
-##  Skeleton Makefile for Vamp plugin builds using command-line tools.
-##
-##  Rename this to Makefile, and edit as appropriate.
-##  This Makefile WILL NOT WORK until you have edited it as described
-##  below -- the Makefile as supplied does nothing useful at all!
-##
-##  Various sets of options are provided, commented out -- just uncomment
-##  (remove the '#' characters for) the set that most closely resembles
-##  your own situation, and adjust to taste.  Then run "make".
-##
-##  (For Windows builds using MS Visual Studio, start instead with the
-##  VampExamplePlugins project found in the build directory of the SDK.)
-
-
-# Edit this to the base name of your plugin library
-#
-PLUGIN_LIBRARY_NAME = matthiasm
-
-# Edit this to list one .o file for each .cpp file in your plugin project
-#
-PLUGIN_CODE_OBJECTS = NNLSChroma.o plugins.o
-
-# Edit this to the location of the Vamp plugin SDK, relative to your
-# project directory
-#
-VAMP_SDK_DIR = ../vamp-plugin-sdk
-NNLS_DIR = .
-LAPACK_DIR=./lapack-linux-amd64
-
-
-##  Uncomment these for an OS/X native build using command-line tools:
-#CXXFLAGS = -I$(VAMP_SDK_DIR) -I$(LAPACK_DIR) -I$(FFT_DIR) -I$(NNLS_DIR) -Wall -fPIC -g
-#PLUGIN_EXT = .dylib
-#PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT)
-#LDFLAGS = -dynamiclib -install_name $(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a $(QMDSP_DIR)/libqm-dsp.a 
-#../tsnnls/tsnnls/.libs/libtsnnls.a -exported_symbols_list vamp-plugin.list -framework Accelerate
-
-
-##  Uncomment these for an OS/X universal binary using command-line tools:
-
-# CXXFLAGS = -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -I$(VAMP_SDK_DIR) -Wall -fPIC
-# PLUGIN_EXT = .dylib
-# PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT)
-# LDFLAGS = -dynamiclib -install_name $(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a ./libtsnnls.a -exported_symbols_list vamp-plugin.list 
-
-##  Uncomment these for Linux using the standard tools:
-
-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 -L$(LAPACK_DIR) -llapack -lf77blas -lcblas -latlas -Wl,--version-script=vamp-plugin.map
-
-
-##  Uncomment these for a cross-compile from Linux to Windows using MinGW:
-
-# CXX = i586-mingw32msvc-g++
-# CXXFLAGS = -I$(VAMP_SDK_DIR) -Wall 
-# PLUGIN_EXT = .dll
-# PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT)
-# LDFLAGS = --static-libgcc -Wl,-soname=$(PLUGIN) -shared $(VAMP_SDK_DIR)/libvamp-sdk.a
-
-
-##  Uncomment these for OpenSolaris using SunStudio compiler and GNU make:
-
-# CXX = CC
-# CXXFLAGS = -G -I$(VAMP_SDK_DIR) +w -KPIC
-# PLUGIN_EXT = .so
-# PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT)
-# LDFLAGS = -G -h$(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a -Qoption ld -Mvamp-plugin.map
-
-
-
-##  All of the above
-
-$(PLUGIN): $(PLUGIN_CODE_OBJECTS)
-	   $(CXX) -o $@ $^ $(LDFLAGS)
-
-clean:
-	rm -f *.o
-
--- a/Makefile.skeleton	Thu Oct 21 16:34:58 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-
-##  Skeleton Makefile for Vamp plugin builds using command-line tools.
-##
-##  Rename this to Makefile, and edit as appropriate.
-##  This Makefile WILL NOT WORK until you have edited it as described
-##  below -- the Makefile as supplied does nothing useful at all!
-##
-##  Various sets of options are provided, commented out -- just uncomment
-##  (remove the '#' characters for) the set that most closely resembles
-##  your own situation, and adjust to taste.  Then run "make".
-##
-##  (For Windows builds using MS Visual Studio, start instead with the
-##  VampExamplePlugins project found in the build directory of the SDK.)
-
-
-# Edit this to the base name of your plugin library
-#
-PLUGIN_LIBRARY_NAME = myplugins
-
-# Edit this to list one .o file for each .cpp file in your plugin project
-#
-PLUGIN_CODE_OBJECTS = MyPlugin.o plugins.o
-
-# Edit this to the location of the Vamp plugin SDK, relative to your
-# project directory
-#
-VAMP_SDK_DIR = ../vamp-plugin-sdk
-
-
-##  Uncomment these for an OS/X native build using command-line tools:
-
-# CXXFLAGS = -I$(VAMP_SDK_DIR) -Wall -fPIC
-# PLUGIN_EXT = .dylib
-# PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT)
-# LDFLAGS = -dynamiclib -install_name $(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a -exported_symbols_list vamp-plugin.list
-
-
-##  Uncomment these for an OS/X universal binary using command-line tools:
-
-# CXXFLAGS = -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -I$(VAMP_SDK_DIR) -Wall -fPIC
-# PLUGIN_EXT = .dylib
-# PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT)
-# LDFLAGS = -dynamiclib -install_name $(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a -exported_symbols_list vamp-plugin.list
-
-
-##  Uncomment these for Linux using the standard tools:
-
-# CXXFLAGS = -I$(VAMP_SDK_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
-
-
-##  Uncomment these for a cross-compile from Linux to Windows using MinGW:
-
-# CXX = i586-mingw32msvc-g++
-# CXXFLAGS = -I$(VAMP_SDK_DIR) -Wall 
-# PLUGIN_EXT = .dll
-# PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT)
-# LDFLAGS = --static-libgcc -Wl,-soname=$(PLUGIN) -shared $(VAMP_SDK_DIR)/libvamp-sdk.a
-
-
-##  Uncomment these for OpenSolaris using SunStudio compiler and GNU make:
-
-# CXX = CC
-# CXXFLAGS = -G -I$(VAMP_SDK_DIR) +w -KPIC
-# PLUGIN_EXT = .so
-# PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT)
-# LDFLAGS = -G -h$(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a -Qoption ld -Mvamp-plugin.map
-
-
-
-##  All of the above
-
-$(PLUGIN): $(PLUGIN_CODE_OBJECTS)
-	   $(CXX) -o $@ $^ $(LDFLAGS)
-
-clean:
-	rm -f *.o
-