Mercurial > hg > piper-cpp

changeset 245:b32c68f08ec0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use local sord/serd build
author Chris Cannam <cannam@all-day-breakfast.com>
date Thu, 15 Jun 2017 09:38:52 +0100
parents f548eb11ae01
children 86d4310c2a62
files Makefile ext/sord/src/zix/btree.c ext/sord/src/zix/btree.h ext/sord/src/zix/digest.c ext/sord/src/zix/digest.h ext/sord/src/zix/hash.c ext/sord/src/zix/hash.h
diffstat 7 files changed, 14 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu Jun 15 09:09:07 2017 +0100
+++ b/Makefile	Thu Jun 15 09:38:52 2017 +0100
@@ -2,15 +2,18 @@
 VAMPSDK_DIR	:= ../vamp-plugin-sdk
 PIPER_DIR	:= ../piper
 
-INCFLAGS	:= -Iext -I/usr/include/sord-0 -I/usr/include/serd-0 -I$(VAMPSDK_DIR) -I. -I/usr/local/include
-CXXFLAGS	:= -Wall -Wextra -Werror -Wno-error=unused-parameter -g3 -std=c++11 $(INCFLAGS)
+INCFLAGS	:= -Iext -Iext/sord -Iext/serd -I$(VAMPSDK_DIR) -I. -I/usr/local/include
 
-#LDFLAGS		:= -L$(VAMPSDK_DIR) -L/usr/local/lib -lvamp-hostsdk -lcapnp -lkj 
-LDFLAGS		:= $(VAMPSDK_DIR)/libvamp-hostsdk.a -lcapnp -lkj -lsord-0 -lserd-0
+OPTFLAGS	:= -O3
+
+CFLAGS		:= -Wall $(OPTFLAGS) $(INCFLAGS)
+CXXFLAGS	:= -Wall -Wextra -Werror -Wno-error=unused-parameter -std=c++11 $(OPTFLAGS) $(INCFLAGS)
+
+LDFLAGS		:= -L$(VAMPSDK_DIR) -L/usr/local/lib -lvamp-hostsdk -lcapnp -lkj 
 
 LDFLAGS		+= -ldl
 
-COMMON_OBJS	:= ext/json11/json11.o vamp-capnp/piper.capnp.o
+COMMON_OBJS	:= ext/json11/json11.o ext/sord/sord-single.o vamp-capnp/piper.capnp.o
 
 TEST_SRCS 	:= test/main.cpp test/vamp-client/tst_PluginStub.cpp
 TEST_OBJS	:= $(TEST_SRCS:.cpp=.o)
--- a/ext/sord/src/zix/btree.c	Thu Jun 15 09:09:07 2017 +0100
+++ b/ext/sord/src/zix/btree.c	Thu Jun 15 09:38:52 2017 +0100
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "zix/btree.h"
+#include "btree.h"
 
 // #define ZIX_BTREE_DEBUG 1
 
--- a/ext/sord/src/zix/btree.h	Thu Jun 15 09:09:07 2017 +0100
+++ b/ext/sord/src/zix/btree.h	Thu Jun 15 09:38:52 2017 +0100
@@ -19,7 +19,7 @@
 
 #include <stddef.h>
 
-#include "zix/common.h"
+#include "common.h"
 
 #ifdef __cplusplus
 extern "C" {
--- a/ext/sord/src/zix/digest.c	Thu Jun 15 09:09:07 2017 +0100
+++ b/ext/sord/src/zix/digest.c	Thu Jun 15 09:38:52 2017 +0100
@@ -14,7 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include "zix/digest.h"
+#include "digest.h"
 
 #ifdef __SSE4_2__
 #    include <smmintrin.h>
--- a/ext/sord/src/zix/digest.h	Thu Jun 15 09:09:07 2017 +0100
+++ b/ext/sord/src/zix/digest.h	Thu Jun 15 09:38:52 2017 +0100
@@ -20,7 +20,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "zix/common.h"
+#include "common.h"
 
 #ifdef __cplusplus
 extern "C" {
--- a/ext/sord/src/zix/hash.c	Thu Jun 15 09:09:07 2017 +0100
+++ b/ext/sord/src/zix/hash.c	Thu Jun 15 09:38:52 2017 +0100
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "zix/hash.h"
+#include "hash.h"
 
 /**
    Primes, each slightly less than twice its predecessor, and as far away
--- a/ext/sord/src/zix/hash.h	Thu Jun 15 09:09:07 2017 +0100
+++ b/ext/sord/src/zix/hash.h	Thu Jun 15 09:38:52 2017 +0100
@@ -20,7 +20,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "zix/common.h"
+#include "common.h"
 
 #ifdef __cplusplus
 extern "C" {