Fix osx build

4 files changed, 35 insertions, 14 deletions

diff --git a/.travis.yml b/.travis.yml
index 0c2709d..b480d27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,13 +14,8 @@ before_install:
 - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
 - sudo apt-get update -qq -y
 - wget http://zamaudio.com/mbox2/apple-macports-fftw-3_3.3.5-1_all.deb
-- wget http://ppa.launchpad.net/kxstudio-team/builds/ubuntu/pool/main/a/apple-macports-libsamplerate/apple-macports-libsamplerate_0.1.8-0_all.deb
-- wget http://ppa.launchpad.net/kxstudio-team/builds/ubuntu/pool/main/a/apple-macports-libsndfile/apple-macports-libsndfile_1.0.25-0_all.deb
+- wget http://zamaudio.com/mbox2/apple-macports-libsamplerate_0.1.9-0_all.deb
 - wget http://ppa.launchpad.net/kxstudio-team/builds/ubuntu/pool/main/a/apple-macports-liblo/apple-macports-liblo_0.26-1_all.deb
-- wget http://ppa.launchpad.net/kxstudio-team/builds/ubuntu/pool/main/a/apple-macports-flac/apple-macports-flac_1.2.1-1_all.deb
-- wget http://ppa.launchpad.net/kxstudio-team/builds/ubuntu/pool/main/a/apple-macports-libogg/apple-macports-libogg_1.3.0-1_all.deb
-- wget http://ppa.launchpad.net/kxstudio-team/builds/ubuntu/pool/main/a/apple-macports-libvorbis/apple-macports-libvorbis_1.3.3-0_all.deb
-- wget http://ppa.launchpad.net/kxstudio-team/builds/ubuntu/pool/main/a/apple-macports-libiconv/apple-macports-libiconv_1.14-0_all.deb
 - wget http://ppa.launchpad.net/kxstudio-team/builds/ubuntu/pool/main/a/apple-x86-gcc/apple-x86-gcc_4.2.1~5646-1kxstudio2_amd64.deb
 - wget http://ppa.launchpad.net/kxstudio-team/builds/ubuntu/pool/main/a/apple-x86-odcctools/apple-x86-odcctools_758.159-0kxstudio2_amd64.deb
 - wget -c https://launchpad.net/~flosoft/+archive/ubuntu/cross-apple/+files/apple-uni-sdk-10.5_20110407-0.flosoft1_amd64.deb --no-check-certificate
@@ -32,12 +27,7 @@ before_install:
 - sudo dpkg -i apple-x86-setup_2_amd64.deb
 - sudo dpkg -i apple-macports-liblo_0.26-1_all.deb
 - sudo dpkg -i apple-macports-fftw-3_3.3.5-1_all.deb
-- sudo dpkg -i apple-macports-libiconv_1.14-0_all.deb
-- sudo dpkg -i apple-macports-libogg_1.3.0-1_all.deb
-- sudo dpkg -i apple-macports-libvorbis_1.3.3-0_all.deb
-- sudo dpkg -i apple-macports-flac_1.2.1-1_all.deb
-- sudo dpkg -i apple-macports-libsndfile_1.0.25-0_all.deb
-- sudo dpkg -i apple-macports-libsamplerate_0.1.8-0_all.deb
+- sudo dpkg -i apple-macports-libsamplerate_0.1.9-0_all.deb
 - sudo apt-get install mingw64-x-gcc -y
 - sudo apt-get install mingw64-x-binutils -y
 - sudo apt-get install mingw64-x-pkgconfig -y
@@ -77,6 +67,7 @@ script:
 - export CC=i686-apple-darwin10-gcc
 - export CXX=i686-apple-darwin10-g++
 - export AR=i686-apple-darwin10-ar
+- export PKG_CONFIG_PATH=/opt/local/lib/pkgconfig
 - make clean
 - touch dpf/utils/lv2_ttl_generator
 - chmod a+x dpf/utils/lv2_ttl_generator
diff --git a/lib/zita-convolver-3.1.0/zita-convolver.h b/lib/zita-convolver-3.1.0/zita-convolver.h
index 0c15710..875bec5 100644
--- a/lib/zita-convolver-3.1.0/zita-convolver.h
+++ b/lib/zita-convolver-3.1.0/zita-convolver.h
@@ -22,6 +22,7 @@
 #define _ZITA_CONVOLVER_H
 
 
+#include <errno.h>
 #include <pthread.h>
 #include <fftw3.h>
 
@@ -74,6 +75,20 @@ private:
 #endif
 
 
+// ADDED BY DZ TO MAKE IT COMPILE FOR >= 10.5
+#ifdef __APPLE__
+inline int posix_memalign(void **memptr, size_t alignment, size_t size)
+{
+   if ((alignment && !(alignment & (alignment - 1))) || (alignment > 16))
+       return EINVAL;
+   *memptr = malloc(size);
+   if (*memptr == NULL)
+       return ENOMEM;
+   return 0;
+}
+#endif
+
+
 #ifdef __APPLE__
 
 // NOTE:  ***** I DO NOT REPEAT NOT PROVIDE SUPPORT FOR OSX *****
diff --git a/plugins/Makefile.mk b/plugins/Makefile.mk
index 6b9728f..fff5b7d 100644
--- a/plugins/Makefile.mk
+++ b/plugins/Makefile.mk
@@ -17,10 +17,25 @@ endif
 
 TARGET_DIR = ../../bin
 
-BASE_FLAGS += -lfftw3f -lpthread -lsamplerate
+
+ifeq ($(WIN32),true)
+LINK_FLAGS += /opt/mingw64/lib/libfftw3f.a /opt/mingw64/lib/libsamplerate.a
+LINK_FLAGS += -DPTW32_STATIC_LIB
+endif
+
+ifeq ($(LINUX),true)
+LINK_FLAGS += $(shell pkg-config --libs fftw3f samplerate)
+LINK_FLAGS += -lpthread
+endif
+
+ifeq ($(MACOS),true)
+LINK_FLAGS += $(shell pkg-config --libs --static fftw3f samplerate)
+LINK_FLAGS += -lpthread
+endif
 
 BUILD_C_FLAGS   += -I.
 BUILD_CXX_FLAGS += -I. -I.. -I../../dpf/distrho -I../../dpf/dgl
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags samplerate fftw3f) -D_POSIX_PTHREAD_SEMANTICS
 
 ifeq ($(HAVE_DGL),true)
 BASE_FLAGS += -DHAVE_DGL
diff --git a/plugins/ZamVerb/convolution.cpp b/plugins/ZamVerb/convolution.cpp
index 8b0b375..e86e366 100644
--- a/plugins/ZamVerb/convolution.cpp
+++ b/plugins/ZamVerb/convolution.cpp
@@ -42,7 +42,7 @@
 #include <pthread.h>
 #include <assert.h>
 
-#include <zita-convolver.h>
+#include "../../lib/zita-convolver-3.1.0/zita-convolver.h"
 #include <sndfile.h>
 #include <samplerate.h>
 #include "convolution.hpp"