Mercurial > hg > nnls-chroma
changeset 155:3226fe4e1280
Build tweaks
| author | Chris Cannam |
|---|---|
| date | Wed, 06 Aug 2014 12:45:06 +0100 |
| parents | 90c2f0b597f8 |
| children | 640875946077 |
| files | Makefile.linux Makefile.mingw Makefile.osx |
| diffstat | 3 files changed, 34 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.linux Tue Aug 05 11:06:18 2014 +0100 +++ b/Makefile.linux Wed Aug 06 12:45:06 2014 +0100 @@ -1,30 +1,30 @@ - -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 + +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 Chordino.o: Chordino.h NNLSBase.h chromamethods.h nnls.h viterbi.h chromamethods.o: chromamethods.h nnls.h
--- a/Makefile.mingw Tue Aug 05 11:06:18 2014 +0100 +++ b/Makefile.mingw Wed Aug 06 12:45:06 2014 +0100 @@ -12,13 +12,13 @@ OPTFLAGS = -O2 -ffast-math -CFLAGS = $(OPTFLAGS) -I$(VAMP_SDK_DIR) -Wall -CXXFLAGS = $(OPTFLAGS) -I$(VAMP_SDK_DIR) -I../boost_1_44_0 -Wall +CFLAGS += $(OPTFLAGS) -I$(VAMP_SDK_DIR) -Wall +CXXFLAGS += $(OPTFLAGS) -I$(VAMP_SDK_DIR) -I../boost_1_44_0 -Wall PLUGIN_EXT = .dll PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT) -LDFLAGS = -shared -fno-exceptions -static-libgcc -Wl,-soname=$(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a -Wl,--version-script=vamp-plugin.map +LDFLAGS += -shared -fno-exceptions -static-libgcc -Wl,-soname=$(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a -Wl,--version-script=vamp-plugin.map $(PLUGIN): $(PLUGIN_CODE_OBJECTS)
--- a/Makefile.osx Tue Aug 05 11:06:18 2014 +0100 +++ b/Makefile.osx Wed Aug 06 12:45:06 2014 +0100 @@ -12,12 +12,12 @@ ## Uncomment these for an OS/X native build using command-line tools: -ARCHFLAGS = -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -arch i386 -CFLAGS = $(ARCHFLAGS) -Wall -fPIC -g -O3 -CXXFLAGS = $(CFLAGS) -I$(VAMP_SDK_DIR) -I$(BOOST_ROOT) +ARCHFLAGS ?= -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -arch i386 +CFLAGS += $(ARCHFLAGS) -Wall -fPIC -g -O3 +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 +LDFLAGS += $(ARCHFLAGS) -dynamiclib -install_name $(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a -exported_symbols_list vamp-plugin.list -framework Accelerate $(PLUGIN): $(PLUGIN_CODE_OBJECTS)