diff options
| author | Damien Zammit <damien@zamaudio.com> | 2017-11-03 00:03:54 +1100 |
|---|---|---|
| committer | Damien Zammit <damien@zamaudio.com> | 2017-11-03 00:03:54 +1100 |
| commit | df42eb874a250bcf24b123697553a4313c251590 (patch) | |
| tree | 0dab8ce322d24f351a72eb40363b530502288ff7 | |
| parent | 0d66af32e42d9a2c211d0ec1526174e0de2ccc66 (diff) | |
Cleanup and fix ZamVerb build on linux/osx
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | lib/zita-convolver-3.1.0/zita-convolver.h | 1 | ||||
| -rw-r--r-- | plugins/Makefile.mk | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 7365d16..f088cff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,6 @@ before_install: - sudo apt-get install mingw64-x-pkgconfig -y - sudo apt-get install mingw64-x-liblo -y - sudo apt-get install mingw64-x-fftw3 -y -- sudo apt-get install mingw64-x-libsndfile -y - sudo dpkg -i mingw64-x-libsamplerate_0.1.8-1kxstudio1_all.deb - sudo apt-get install g++-4.8 -y - sudo apt-get install binutils -y @@ -42,7 +41,6 @@ before_install: - sudo apt-get install libgl1-mesa-dev -y - sudo apt-get install liblo-dev -y - sudo apt-get install fftw3-dev -y -- sudo apt-get install libsndfile-dev -y - sudo apt-get install libsamplerate0-dev -y - sudo apt-get install libjack-dev -y - sudo apt-get install ladspa-sdk -y @@ -68,6 +66,8 @@ script: - export CXX=i686-apple-darwin10-g++ - export AR=i686-apple-darwin10-ar - export PKG_CONFIG_PATH=/opt/local/lib/pkgconfig +- export CXXFLAGS="-I/opt/local/include" +- export CFLAGS="-I/opt/local/include" - 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 875bec5..f19b6da 100644 --- a/lib/zita-convolver-3.1.0/zita-convolver.h +++ b/lib/zita-convolver-3.1.0/zita-convolver.h @@ -21,6 +21,7 @@ #ifndef _ZITA_CONVOLVER_H #define _ZITA_CONVOLVER_H +#define _POSIX_PTHREAD_SEMANTICS #include <errno.h> #include <pthread.h> diff --git a/plugins/Makefile.mk b/plugins/Makefile.mk index fff5b7d..a0bceb0 100644 --- a/plugins/Makefile.mk +++ b/plugins/Makefile.mk @@ -19,7 +19,6 @@ TARGET_DIR = ../../bin ifeq ($(WIN32),true) -LINK_FLAGS += /opt/mingw64/lib/libfftw3f.a /opt/mingw64/lib/libsamplerate.a LINK_FLAGS += -DPTW32_STATIC_LIB endif @@ -35,7 +34,7 @@ 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 +BUILD_CXX_FLAGS += $(shell pkg-config --cflags samplerate fftw3f) ifeq ($(HAVE_DGL),true) BASE_FLAGS += -DHAVE_DGL |