changeset 104:9db1ea00b1e6

Add OSX makefile, export Vamp SDK dir to subprocess
author Chris Cannam
date Mon, 15 Jun 2015 16:46:48 +0100
parents 141d3bfe1503
children 4fd3520ff206
files .hgsubstate Makefile.inc Makefile.osx
diffstat 3 files changed, 29 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Tue Feb 17 11:22:26 2015 +0000
+++ b/.hgsubstate	Mon Jun 15 16:46:48 2015 +0100
@@ -1,1 +1,1 @@
-42e71acaba8eb051b46009459ddd1e99f2176270 test/vamp-test-plugin
+867364fe9bf67046be16ebd6516b16f3b21a08ce test/vamp-test-plugin
--- a/Makefile.inc	Tue Feb 17 11:22:26 2015 +0000
+++ b/Makefile.inc	Mon Jun 15 16:46:48 2015 +0100
@@ -29,7 +29,7 @@
 		@touch $@
 
 $(TESTPLUG):	
-		$(MAKE) -C $(TESTPLUG_DIR) -f Makefile$(MAKEFILE_EXT)
+		$(MAKE) -C $(TESTPLUG_DIR) -f Makefile$(MAKEFILE_EXT) VAMPSDK_DIR=../../../vamp-plugin-sdk
  
 clean:		
 		$(MAKE) -C $(TESTPLUG_DIR) -f Makefile$(MAKEFILE_EXT) clean
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.osx	Mon Jun 15 16:46:48 2015 +0100
@@ -0,0 +1,27 @@
+
+PY_INCLUDE_PATH		:= /anaconda/include/python2.7
+NUMPY_INCLUDE_PATH 	:= /anaconda/pkgs/numpy-1.9.2-py27_0/lib/python2.7/site-packages/numpy/core/include
+PY_LIB			:= python2.7
+PY_TEST			:= nosetests2
+
+#PY_INCLUDE_PATH		:= /usr/include/python3.4m
+#NUMPY_INCLUDE_PATH 	:= /usr/lib/python3.4m/site-packages/numpy/core/include
+#PY_LIB			:= python3
+#PY_TEST			:= nosetests3
+
+ARCHFLAGS ?= -mmacosx-version-min=10.7 -arch x86_64 -arch i386 -stdlib=libc++
+
+# Compile flags
+#
+CFLAGS          += $(ARCHFLAGS) -fPIC -I$(PY_INCLUDE_PATH) -I$(NUMPY_INCLUDE_PATH) -I../vamp-plugin-sdk
+CXXFLAGS        += $(ARCHFLAGS) -O2 -Wall -I. -fPIC -I$(PY_INCLUDE_PATH) -I$(NUMPY_INCLUDE_PATH) -I../vamp-plugin-sdk
+
+LDFLAGS 		:= -dynamiclib -L../vamp-plugin-sdk -lvamp-hostsdk -L/anaconda/lib/ -lpython -ldl
+
+NOSE			:= $(PY_TEST)
+
+LIBRARY_EXT 		:= .dylib
+
+MAKEFILE_EXT		:= .osx
+
+include Makefile.inc