changeset 279:a19319b701cc

Merge
author Chris Cannam
date Wed, 06 Aug 2014 09:54:18 +0100
parents 34768d6642aa (current diff) f0bc70ecf43d (diff)
children 8e94604ccff2
files .hgsubstate
diffstat 2 files changed, 18 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Wed Aug 06 09:54:04 2014 +0100
+++ b/.hgsubstate	Wed Aug 06 09:54:18 2014 +0100
@@ -1,3 +1,3 @@
 a7ded7b1ce692125e70071a01ee20097e79addc6 bqvec
-c5d37d1ed0f8a04c851ca3cfeb70125c3ac9ca9e constant-q-cpp
+870077df3318592492aaa178d20d7d581a7c8f8f constant-q-cpp
 d25a2e91e9d84aaff25e5d746398232d182d127d flattendynamics
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.osx	Wed Aug 06 09:54:18 2014 +0100
@@ -0,0 +1,17 @@
+
+ARCHFLAGS	?= -mmacosx-version-min=10.6 -arch x86_64 -arch i386
+
+CXXFLAGS 	+= $(ARCHFLAGS) -O3 -ftree-vectorize -I../vamp-plugin-sdk
+
+LDFLAGS	    	+= $(ARCHFLAGS) -dynamiclib ../vamp-plugin-sdk/libvamp-sdk.a -exported_symbols_list vamp-plugin.list -install_name silvet.dylib
+
+PLUGIN_EXT   := .dylib
+
+MAKEFILE_EXT := .osx
+
+include Makefile.inc
+
+.PHONY: constant-q-cpp
+constant-q-cpp: 
+	$(MAKE) -C $@ -f Makefile$(MAKEFILE_EXT) libcq.a
+