Mercurial > hg > vamp-fanchirp

changeset 26:390720c55c86 spect

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update build system to bring in vamp-plugin-sdk via Repoint and link directly with that
author Chris Cannam
date Thu, 04 Oct 2018 16:00:03 +0100
parents 430c730ae912
children 9ebd08bdd168
files .hgignore Makefile.inc Makefile.linux repoint-lock.json repoint-project.json
diffstat 5 files changed, 21 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Thu Oct 04 15:22:23 2018 +0100
+++ b/.hgignore	Thu Oct 04 16:00:03 2018 +0100
@@ -2,5 +2,5 @@
 *~
 *.so
 *.o
-
+*.log
 glob:.repoint*
--- a/Makefile.inc	Thu Oct 04 15:22:23 2018 +0100
+++ b/Makefile.inc	Thu Oct 04 16:00:03 2018 +0100
@@ -41,11 +41,16 @@
 SRC_DIR		:= .
 
 # Defaults, overridden from the platform-specific Makefile
-VAMPSDK_DIR	?= ../vamp-plugin-sdk
+VAMPSDK_DIR	?= ext/vamp-plugin-sdk
 PLUGIN_EXT	?= .so
 CXX 		?= g++
 CC 		?= gcc
 
+VAMP_SOURCES	:= \
+	$(VAMPSDK_DIR)/src/vamp-sdk/PluginAdapter.cpp \
+	$(VAMPSDK_DIR)/src/vamp-sdk/FFT.cpp \
+	$(VAMPSDK_DIR)/src/vamp-sdk/RealTime.cpp
+
 CFLAGS		:= $(ARCHFLAGS) $(CFLAGS)
 CXXFLAGS	:= $(CFLAGS) -I. -I$(VAMPSDK_DIR) -Iext/bqvec $(CXXFLAGS)
 
@@ -54,13 +59,16 @@
 
 PLUGIN 		:= $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT)
 
-PLUGIN_OBJECTS 	:= $(PLUGIN_SOURCES:.cpp=.o)
+PLUGIN_OBJECTS 	:= $(PLUGIN_SOURCES:.cpp=.o) $(VAMP_SOURCES:.cpp=.o)
 PLUGIN_OBJECTS 	:= $(PLUGIN_OBJECTS:.c=.o)
 
 $(PLUGIN): $(PLUGIN_OBJECTS) 
-	   $(CXX) -o $@ $^ $(PLUGIN_LDFLAGS)
+	$(CXX) -o $@ $^ $(PLUGIN_LDFLAGS)
 
-$(PLUGIN_OBJECTS): $(PLUGIN_HEADERS)
+$(PLUGIN_OBJECTS): .repoint.point $(PLUGIN_HEADERS)
+
+.repoint.point:    repoint-project.json
+	./repoint install
 
 clean:
 	rm -f $(PLUGIN_OBJECTS)
--- a/Makefile.linux	Thu Oct 04 15:22:23 2018 +0100
+++ b/Makefile.linux	Thu Oct 04 16:00:03 2018 +0100
@@ -17,15 +17,10 @@
 CFLAGS		:= -Wall -Wextra -O3 -msse -msse2 -mfpmath=sse -ftree-vectorize -fPIC
 
 
-# Location of Vamp plugin SDK relative to the project directory
-
-VAMPSDK_DIR	:= ../vamp-plugin-sdk
-
-
 # Libraries and linker flags required by plugin: add any -l<library>
 # options here
 
-PLUGIN_LDFLAGS	:= -shared -Wl,-Bsymbolic -Wl,-z,defs -Wl,--version-script=vamp-plugin.map $(VAMPSDK_DIR)/libvamp-sdk.a
+PLUGIN_LDFLAGS	:= -shared -Wl,-Bsymbolic -Wl,-z,defs -Wl,--version-script=vamp-plugin.map
 
 
 # File extension for plugin library on this platform
--- a/repoint-lock.json	Thu Oct 04 15:22:23 2018 +0100
+++ b/repoint-lock.json	Thu Oct 04 16:00:03 2018 +0100
@@ -1,5 +1,8 @@
 {
   "libraries": {
+    "vamp-plugin-sdk": {
+      "pin": "da86fb0bccb3"
+    },
     "bqvec": {
       "pin": "3c9de9e7f6e8"
     }
--- a/repoint-project.json	Thu Oct 04 15:22:23 2018 +0100
+++ b/repoint-project.json	Thu Oct 04 16:00:03 2018 +0100
@@ -10,6 +10,10 @@
         }
     },
     "libraries": {
+        "vamp-plugin-sdk": {
+            "vcs": "hg",
+            "service": "soundsoftware"
+	},
         "bqvec": {
             "vcs": "hg",
             "service": "bitbucket",