diff options
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 7 | ||||
-rw-r--r-- | tools/rbspeex/Makefile | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index 4b170cd01e..e705497b1e 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro | |||
@@ -28,8 +28,11 @@ RBBASE_DIR = $$replace(RBBASE_DIR,/rbutil/rbutilqt,) | |||
28 | message("Rockbox Base dir: "$$RBBASE_DIR) | 28 | message("Rockbox Base dir: "$$RBBASE_DIR) |
29 | 29 | ||
30 | # check for system speex. Add a custom rule for pre-building librbspeex if not found. | 30 | # check for system speex. Add a custom rule for pre-building librbspeex if not found. |
31 | LIBSPEEX = $$system(pkg-config --libs speex) | 31 | LIBSPEEX = $$system(pkg-config --silence-errors --libs speex) |
32 | !static:!isEmpty(LIBSPEEX) { | 32 | !static:!isEmpty(LIBSPEEX) |
33 | # newer versions of speex are split up into libspeex and libspeexdsp. | ||
34 | # avoid checking twice if libspeex is missing. | ||
35 | LIBSPEEX += $$system(pkg-config --silence-errors --libs speexdsp) | ||
33 | LIBS += $$LIBSPEEX | 36 | LIBS += $$LIBSPEEX |
34 | } | 37 | } |
35 | !mac { | 38 | !mac { |
diff --git a/tools/rbspeex/Makefile b/tools/rbspeex/Makefile index 8c46677ce8..87ce08f3e7 100644 --- a/tools/rbspeex/Makefile +++ b/tools/rbspeex/Makefile | |||
@@ -33,7 +33,10 @@ endif | |||
33 | 33 | ||
34 | # don't try to use the systems libspeex when building a static binary. | 34 | # don't try to use the systems libspeex when building a static binary. |
35 | ifndef STATIC | 35 | ifndef STATIC |
36 | SYS_SPEEX = $(shell pkg-config --libs speex) | 36 | SYS_SPEEX = $(shell pkg-config --silence-errors --libs speex) |
37 | ifneq ($(SYS_SPEEX),) | ||
38 | SYS_SPEEX += $(shell pkg-config --silence-errors --libs speexdsp) | ||
39 | endif | ||
37 | endif | 40 | endif |
38 | 41 | ||
39 | # fall back to our own librbspeex if no suitable found. | 42 | # fall back to our own librbspeex if no suitable found. |