diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2016-01-08 03:09:52 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2016-01-08 03:09:52 (GMT) |
| commit | 03cbbcf46d2d2717d9a9c4926139379020572673 (patch) | |
| tree | 37dfe50c74a0463b8d156a8f76e71f3255854733 /src/aubio.mk | |
| parent | d7eb795051462a93cbd213f003eb295e6dbdcbd0 (diff) | |
| parent | a39897c2810cabac4bc0a35102f3633d2a8d5065 (diff) | |
| download | mxe-03cbbcf46d2d2717d9a9c4926139379020572673.zip mxe-03cbbcf46d2d2717d9a9c4926139379020572673.tar.gz mxe-03cbbcf46d2d2717d9a9c4926139379020572673.tar.bz2 | |
Merge pull request #1139 from TimothyGu/aubio
Fix aubio
Diffstat (limited to 'src/aubio.mk')
| -rw-r--r-- | src/aubio.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/aubio.mk b/src/aubio.mk index 27f2f68..df05acb 100644 --- a/src/aubio.mk +++ b/src/aubio.mk @@ -29,7 +29,7 @@ define $(PKG)_BUILD --prefix='$(PREFIX)/$(TARGET)' \ --enable-fftw3f \ $(if $(BUILD_STATIC), \ - --enable-static --disable-shared, \ + --enable-static --disable-shared --disable-jack, \ --disable-static --enable-shared) # disable txt2man and doxygen @@ -37,10 +37,6 @@ define $(PKG)_BUILD cd '$(1)' && '$(PREFIX)/$(BUILD)/bin/waf' build install - # It is not trivial to adjust the installation in waf-based builds - $(if $(BUILD_STATIC), \ - $(INSTALL) -m644 '$(1)/build/src/libaubio.a' '$(PREFIX)/$(TARGET)/lib') - '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-aubio.exe' \ |