comparison Makefile @ 12:d58409ecd720

* Merging Chris' changes
author Carl Bussey <c.bussey@se10.qmul.ac.uk>
date Wed, 13 Aug 2014 10:47:39 +0100
parents 17a260410116
children c11367df624d
comparison
equal deleted inserted replaced
11:09fb76606b2b 12:d58409ecd720
28 PLUGIN_HEADERS := Tempogram.h FIRFilter.h WindowFunction.h NoveltyCurve.h Spectrogram.h 28 PLUGIN_HEADERS := Tempogram.h FIRFilter.h WindowFunction.h NoveltyCurve.h Spectrogram.h
29 29
30 # Edit this to the location of the Vamp plugin SDK, relative to your 30 # Edit this to the location of the Vamp plugin SDK, relative to your
31 # project directory 31 # project directory
32 # 32 #
33 #VAMP_SDK_DIR := ../../vamp-plugin-sdk
33 VAMP_SDK_DIR := /usr/local/include 34 VAMP_SDK_DIR := /usr/local/include
34 35
35 36
36 ## Uncomment these for an OS/X universal binary (32- and 64-bit Intel) 37 ## Uncomment these for an OS/X universal binary (32- and 64-bit Intel)
37 ## supporting 10.5 or newer. Use this if you have OS/X 10.7 with the 38 ## supporting 10.5 or newer. Use this if you have OS/X 10.7 with the
63 # LDFLAGS := $(CXXFLAGS) -dynamiclib -install_name $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT) $(VAMP_SDK_DIR)/libvamp-sdk.a -exported_symbols_list vamp-plugin.list 64 # LDFLAGS := $(CXXFLAGS) -dynamiclib -install_name $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT) $(VAMP_SDK_DIR)/libvamp-sdk.a -exported_symbols_list vamp-plugin.list
64 65
65 66
66 ## Uncomment these for Linux using the standard tools: 67 ## Uncomment these for Linux using the standard tools:
67 68
68 # CXXFLAGS := -I$(VAMP_SDK_DIR) -Wall -fPIC 69 # CXXFLAGS := -I$(VAMP_SDK_DIR) -Wall -fPIC -g
69 # PLUGIN_EXT := .so 70 # PLUGIN_EXT := .so
70 # LDFLAGS := -shared -Wl,-soname=$(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT) $(VAMP_SDK_DIR)/libvamp-sdk.a -Wl,--version-script=vamp-plugin.map 71 # LDFLAGS := -shared -Wl,-soname=$(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT) $(VAMP_SDK_DIR)/libvamp-sdk.a -Wl,--version-script=vamp-plugin.map
71 72
72 73
73 ## Uncomment these for a cross-compile from Linux to Windows using MinGW: 74 ## Uncomment these for a cross-compile from Linux to Windows using MinGW: