diff options
| author | Damien Zammit <damien@zamaudio.com> | 2017-11-07 22:29:50 +1100 |
|---|---|---|
| committer | Damien Zammit <damien@zamaudio.com> | 2017-11-07 22:29:50 +1100 |
| commit | b594986a59dc56bd420508f35062c28ca9666124 (patch) | |
| tree | 357b54cb0c9aff15d951e2e8694a6e1681b9d412 | |
| parent | 8686aced1d6bc27daccb7e56764c776e72060382 (diff) | |
build: Bump pthread build dep to 0.0.1-3 (adds missing lib32)
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rw-r--r-- | plugins/Makefile.mk | 6 |
3 files changed, 5 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 7b4c8fe..005d0c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ before_install: - wget http://zamaudio.com/mbox2/apple-macports-libsamplerate_0.1.9-1_all.deb - wget http://zamaudio.com/mbox2/mingw64-x-fftw-3_3.3.5-1_all.deb - wget http://zamaudio.com/mbox2/mingw64-x-libsamplerate_0.1.9-1_all.deb -- wget http://zamaudio.com/mbox2/mingw64-x-pthread_0.0.1-2_all.deb +- wget http://zamaudio.com/mbox2/mingw64-x-pthread_0.0.1-3_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-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 @@ -34,7 +34,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-x-pthread_0.0.1-2_all.deb +- sudo dpkg -i mingw64-x-pthread_0.0.1-3_all.deb - sudo dpkg -i mingw64-x-fftw-3_3.3.5-1_all.deb - sudo dpkg -i mingw64-x-libsamplerate_0.1.9-1_all.deb - sudo apt-get install g++-4.8 -y @@ -76,7 +76,7 @@ RUN dpkg -i mingw64-x-libsamplerate_0.1.9-1_all.deb RUN wget http://zamaudio.com/mbox2/mingw64-x-fftw-3_3.3.5-1_all.deb RUN dpkg -i mingw64-x-fftw-3_3.3.5-1_all.deb -RUN wget http://zamaudio.com/mbox2/mingw64-x-pthread_0.0.1-2_all.deb -RUN dpkg -i mingw64-x-pthread_0.0.1-2_all.deb +RUN wget http://zamaudio.com/mbox2/mingw64-x-pthread_0.0.1-3_all.deb +RUN dpkg -i mingw64-x-pthread_0.0.1-3_all.deb CMD [] diff --git a/plugins/Makefile.mk b/plugins/Makefile.mk index 66ea363..6de9f13 100644 --- a/plugins/Makefile.mk +++ b/plugins/Makefile.mk @@ -23,15 +23,11 @@ LINK_FLAGS += $(shell pkg-config --libs fftw3f samplerate) LINK_FLAGS += -lpthread endif -ifeq ($(MACOS),true) +ifneq ($(LINUX),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) |