diff options
| author | Damien Zammit <damien@zamaudio.com> | 2017-11-04 22:32:47 +1100 |
|---|---|---|
| committer | Damien Zammit <damien@zamaudio.com> | 2017-11-04 22:32:47 +1100 |
| commit | cac244cf21ccc1bd9fb4411fff6d9d01d26a0f35 (patch) | |
| tree | 2bb9920d2c3b9c87959d2ed14e4b49df6a7398f2 | |
| parent | f670b7236bc96262c64052f6f7c559da214556fb (diff) | |
ZamVerb: Fix pthread build deps for windows 32/64 bit
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | plugins/Makefile.mk | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index dd67c14..608e93a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ before_install: - sudo apt-get install mingw64-x-binutils -y - sudo apt-get install mingw64-x-pkgconfig -y - sudo apt-get install mingw64-x-liblo -y -- sudo dpkg -i mingw64-fftw-3_3.3.3-3_all.deb +- sudo dpkg -i mingw64-x-fftw-3_3.3.3-3_all.deb - sudo dpkg -i mingw64-x-libsamplerate_0.1.9-1_all.deb - sudo apt-get install g++-4.8 -y - sudo apt-get install binutils -y @@ -91,7 +91,7 @@ script: - mkdir bin - export CXXFLAGS="-I/opt/mingw64/x86_64-w64-mingw32/include -I/opt/mingw64/include" - export CFLAGS="-I/opt/mingw64/x86_64-w64-mingw32/include -I/opt/mingw64/include" -- export LDFLAGS= +- export LDFLAGS=-lpthread - export PKG_CONFIG_PATH=/opt/mingw64/lib/pkgconfig - make clean - touch dpf/utils/lv2_ttl_generator.exe diff --git a/plugins/Makefile.mk b/plugins/Makefile.mk index ad5af58..b4acf94 100644 --- a/plugins/Makefile.mk +++ b/plugins/Makefile.mk @@ -27,11 +27,15 @@ LINK_FLAGS += $(shell pkg-config --libs fftw3f samplerate) LINK_FLAGS += -lpthread endif -ifneq ($(LINUX),true) +ifeq ($(MACOS),true) LINK_FLAGS += $(shell pkg-config --libs --static fftw3f samplerate) LINK_FLAGS += -lpthread endif +ifeq ($(WIN32),true) +LINK_FLAGS += $(shell pkg-config --libs --static pthread fftw3f samplerate) +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) |