# HG changeset patch # User Chris Cannam # Date 1497515932 -3600 # Node ID b32c68f08ec05c3041633f02f1efb2c8e1934b9d # Parent f548eb11ae011f55b492b94bf78177614a1c2728 Use local sord/serd build diff -r f548eb11ae01 -r b32c68f08ec0 Makefile --- 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) diff -r f548eb11ae01 -r b32c68f08ec0 ext/sord/src/zix/btree.c --- 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 #include -#include "zix/btree.h" +#include "btree.h" // #define ZIX_BTREE_DEBUG 1 diff -r f548eb11ae01 -r b32c68f08ec0 ext/sord/src/zix/btree.h --- 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 -#include "zix/common.h" +#include "common.h" #ifdef __cplusplus extern "C" { diff -r f548eb11ae01 -r b32c68f08ec0 ext/sord/src/zix/digest.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 diff -r f548eb11ae01 -r b32c68f08ec0 ext/sord/src/zix/digest.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 #include -#include "zix/common.h" +#include "common.h" #ifdef __cplusplus extern "C" { diff -r f548eb11ae01 -r b32c68f08ec0 ext/sord/src/zix/hash.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 #include -#include "zix/hash.h" +#include "hash.h" /** Primes, each slightly less than twice its predecessor, and as far away diff -r f548eb11ae01 -r b32c68f08ec0 ext/sord/src/zix/hash.h --- 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 #include -#include "zix/common.h" +#include "common.h" #ifdef __cplusplus extern "C" {