changeset 62:f3afde2a8ced matthiasm-plugin

* Rename Makefiles so that you always have to run make -f instead of one platform-specific variation appearing to be "standard"
author Chris Cannam
date Tue, 26 Oct 2010 11:11:04 +0200
parents 08d24cc21312
children a960925f50ba 611a3cfab5fc
files Makefile Makefile.cc-linux Makefile.linux Makefile.mingw Makefile.osx
diffstat 5 files changed, 107 insertions(+), 87 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Oct 26 17:45:33 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-PLUGIN_LIBRARY_NAME = nnls-chroma
-
-# Edit this to list one .o file for each .cpp file in your plugin project
-#
-PLUGIN_CODE_OBJECTS = NNLSBase.o NNLSChroma.o Chordino.o Tuning.o plugins.o nnls.o chromamethods.o viterbi.o
-
-# Edit this to the location of the Vamp plugin SDK, relative to your
-# project directory
-#
-VAMP_SDK_DIR = ../vamp-plugin-sdk
-BOOST_ROOT = ../boost_1_44_0
-
-
-##  Uncomment these for an OS/X native build using command-line tools:
-ARCHFLAGS = -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -arch i386
-CFLAGS = $(ARCHFLAGS) -Wall -fPIC -g
-CXXFLAGS = $(CFLAGS) -I$(VAMP_SDK_DIR) -I$(BOOST_ROOT)
-PLUGIN_EXT = .dylib
-PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT)
-LDFLAGS = $(ARCHFLAGS) -dynamiclib -install_name $(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a  -exported_symbols_list vamp-plugin.list -framework Accelerate
-
-
-$(PLUGIN): $(PLUGIN_CODE_OBJECTS)
-	   $(CXX) -o $@ $^ $(LDFLAGS)
-
-nnls.o:	nnls.c		# not nnls.f
-
-clean:
-	rm -f *.o
-
-# DO NOT DELETE
-
-nnls.o: nnls.h
-Chordino.o: Chordino.h NNLSBase.h chromamethods.h nnls.h
-chromamethods.o: chromamethods.h nnls.h chorddict.cpp
-NNLSBase.o: NNLSBase.h chromamethods.h nnls.h
-NNLSChroma.o: NNLSChroma.h NNLSBase.h chromamethods.h nnls.h
-plugins.o: NNLSChroma.h NNLSBase.h Chordino.h Tuning.h
-Tuning.o: Tuning.h NNLSBase.h chromamethods.h nnls.h
-Chordino.o: NNLSBase.h
-chromamethods.o: nnls.h
-NNLSChroma.o: NNLSBase.h
-Tuning.o: NNLSBase.h
-viterbi.o: viterbi.h
--- a/Makefile.cc-linux	Tue Oct 26 17:45:33 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-
-PLUGIN_LIBRARY_NAME = nnls-chroma
-
-PLUGIN_CODE_OBJECTS = chromamethods.o NNLSBase.o NNLSChroma.o Chordino.o Tuning.o plugins.o nnls.o
-
-VAMP_SDK_DIR = ../vamp-plugin-sdk
-
-
-ARCHFLAGS = -O3 -ftree-vectorize -ffast-math
-#ARCHFLAGS = -g
-
-CFLAGS = $(ARCHFLAGS) -I$(VAMP_SDK_DIR) -Wall -fPIC
-CXXFLAGS = $(ARCHFLAGS) -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 
-
-
-
-
-##  All of the above
-
-$(PLUGIN): $(PLUGIN_CODE_OBJECTS)
-	   $(CXX) -o $@ $^ $(LDFLAGS)
-
-nnls.o:	nnls.c		# not nnls.f
-
-clean:
-	rm -f *.o
-
-# DO NOT DELETE
-
-nnls.o: nnls.h
-Chordino.o: Chordino.h NNLSBase.h chromamethods.h nnls.h
-chromamethods.o: chromamethods.h nnls.h chorddict.cpp
-NNLSBase.o: NNLSBase.h chromamethods.h nnls.h
-NNLSChroma.o: NNLSChroma.h NNLSBase.h chromamethods.h nnls.h
-plugins.o: NNLSChroma.h NNLSBase.h Chordino.h Tuning.h
-Tuning.o: Tuning.h NNLSBase.h chromamethods.h nnls.h
-Chordino.o: NNLSBase.h
-chromamethods.o: nnls.h
-NNLSChroma.o: NNLSBase.h
-Tuning.o: NNLSBase.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.linux	Tue Oct 26 11:11:04 2010 +0200
@@ -0,0 +1,39 @@
+
+PLUGIN_LIBRARY_NAME = nnls-chroma
+
+PLUGIN_CODE_OBJECTS = chromamethods.o NNLSBase.o NNLSChroma.o Chordino.o Tuning.o plugins.o nnls.o viterbi.o
+
+VAMP_SDK_DIR = ../vamp-plugin-sdk
+
+
+ARCHFLAGS = -O3 -ftree-vectorize -ffast-math
+#ARCHFLAGS = -g
+
+CFLAGS = $(ARCHFLAGS) -I$(VAMP_SDK_DIR) -Wall -fPIC
+CXXFLAGS = $(ARCHFLAGS) -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 
+
+
+$(PLUGIN): $(PLUGIN_CODE_OBJECTS)
+	   $(CXX) -o $@ $^ $(LDFLAGS)
+
+nnls.o:	nnls.c		# not nnls.f
+
+clean:
+	rm -f *.o
+
+# DO NOT DELETE
+
+nnls.o: nnls.h
+Chordino.o: Chordino.h NNLSBase.h chromamethods.h nnls.h
+chromamethods.o: chromamethods.h nnls.h chorddict.cpp
+NNLSBase.o: NNLSBase.h chromamethods.h nnls.h
+NNLSChroma.o: NNLSChroma.h NNLSBase.h chromamethods.h nnls.h
+plugins.o: NNLSChroma.h NNLSBase.h Chordino.h Tuning.h
+Tuning.o: Tuning.h NNLSBase.h chromamethods.h nnls.h
+Chordino.o: NNLSBase.h
+chromamethods.o: nnls.h
+NNLSChroma.o: NNLSBase.h
+Tuning.o: NNLSBase.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.mingw	Tue Oct 26 11:11:04 2010 +0200
@@ -0,0 +1,24 @@
+
+PLUGIN_LIBRARY_NAME = nnls-chroma
+
+PLUGIN_CODE_OBJECTS = chromamethods.o NNLSBase.o NNLSChroma.o Chordino.o Tuning.o plugins.o nnls.o viterbi.o
+
+VAMP_SDK_DIR = ../vamp-plugin-sdk
+
+CC=gcc
+CXX=g++
+
+CFLAGS = -I$(VAMP_SDK_DIR) -Wall -O3 -ffast-math -msse -msse2 -mfpmath=sse -ftree-vectorize -fPIC
+#CFLAGS = -g -I$(VAMP_SDK_DIR) -Wall -fPIC
+CXXFLAGS = -I$(VAMP_SDK_DIR) -I../boost_1_44_0 -Wall -fPIC
+PLUGIN_EXT = .dll
+PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT)
+LDFLAGS = -shared -Wl,-soname=$(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a -Wl,--version-script=vamp-plugin.map 
+
+
+$(PLUGIN): $(PLUGIN_CODE_OBJECTS)
+	   $(CXX) -o $@ $^ $(LDFLAGS)
+
+clean:
+	del *.o
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.osx	Tue Oct 26 11:11:04 2010 +0200
@@ -0,0 +1,44 @@
+PLUGIN_LIBRARY_NAME = nnls-chroma
+
+# Edit this to list one .o file for each .cpp file in your plugin project
+#
+PLUGIN_CODE_OBJECTS = NNLSBase.o NNLSChroma.o Chordino.o Tuning.o plugins.o nnls.o chromamethods.o viterbi.o
+
+# Edit this to the location of the Vamp plugin SDK, relative to your
+# project directory
+#
+VAMP_SDK_DIR = ../vamp-plugin-sdk
+BOOST_ROOT = ../boost_1_44_0
+
+
+##  Uncomment these for an OS/X native build using command-line tools:
+ARCHFLAGS = -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -arch i386
+CFLAGS = $(ARCHFLAGS) -Wall -fPIC -g
+CXXFLAGS = $(CFLAGS) -I$(VAMP_SDK_DIR) -I$(BOOST_ROOT)
+PLUGIN_EXT = .dylib
+PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT)
+LDFLAGS = $(ARCHFLAGS) -dynamiclib -install_name $(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a  -exported_symbols_list vamp-plugin.list -framework Accelerate
+
+
+$(PLUGIN): $(PLUGIN_CODE_OBJECTS)
+	   $(CXX) -o $@ $^ $(LDFLAGS)
+
+nnls.o:	nnls.c		# not nnls.f
+
+clean:
+	rm -f *.o
+
+# DO NOT DELETE
+
+nnls.o: nnls.h
+Chordino.o: Chordino.h NNLSBase.h chromamethods.h nnls.h
+chromamethods.o: chromamethods.h nnls.h chorddict.cpp
+NNLSBase.o: NNLSBase.h chromamethods.h nnls.h
+NNLSChroma.o: NNLSChroma.h NNLSBase.h chromamethods.h nnls.h
+plugins.o: NNLSChroma.h NNLSBase.h Chordino.h Tuning.h
+Tuning.o: Tuning.h NNLSBase.h chromamethods.h nnls.h
+Chordino.o: NNLSBase.h
+chromamethods.o: nnls.h
+NNLSChroma.o: NNLSBase.h
+Tuning.o: NNLSBase.h
+viterbi.o: viterbi.h