Mercurial > hg > silvet

changeset 156:46818fed7174

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
OS/X build stuff
author Chris Cannam
date Fri, 16 May 2014 10:45:42 +0100
parents e1ebbae52cff
children 8964b4920689
files .hgsubstate Makefile.inc Makefile.linux vamp-plugin.list
diffstat 4 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Fri May 16 10:28:46 2014 +0100
+++ b/.hgsubstate	Fri May 16 10:45:42 2014 +0100
@@ -1,2 +1,2 @@
 a2621605a8c2119bb063c59e83f4fe792a58e4ac bqvec
-f3deb9eb13f531ae54f2cb35f856578dc7761b5b constant-q-cpp
+b38f16957a7eb105ba431438eab17b9b3dcb5283 constant-q-cpp
--- a/Makefile.inc	Fri May 16 10:28:46 2014 +0100
+++ b/Makefile.inc	Fri May 16 10:45:42 2014 +0100
@@ -30,7 +30,7 @@
 OBJECTS	     := $(SOURCES:.cpp=.o)
 OBJECTS	     := $(OBJECTS:.c=.o)
 
-LIBS	:= $(CQ_DIR)/libcq.a $(VAMPSDK_DIR)/libvamp-sdk.a -lpthread
+LIBS	:= $(CQ_DIR)/libcq.a $(VAMPSDK_DIR)/libvamp-sdk.a
 
 all: $(PLUGIN)
 
--- a/Makefile.linux	Fri May 16 10:28:46 2014 +0100
+++ b/Makefile.linux	Fri May 16 10:45:42 2014 +0100
@@ -6,7 +6,7 @@
 CXXFLAGS := $(CFLAGS)
 
 VAMPSDK_DIR := ../vamp-plugin-sdk
-PLUGIN_LDFLAGS := -lgomp -shared -Wl,-Bsymbolic -Wl,-z,defs -Wl,--version-script=vamp-plugin.map
+PLUGIN_LDFLAGS := -lgomp -shared -Wl,-Bsymbolic -Wl,-z,defs -Wl,--version-script=vamp-plugin.map -lpthread
 
 PLUGIN_EXT := .so
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vamp-plugin.list	Fri May 16 10:45:42 2014 +0100
@@ -0,0 +1,1 @@
+_vampGetPluginDescriptor