diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-10-13 20:53:25 +0000 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-10-13 20:53:25 +0000 |
| commit | bc748951b976342c2c0216ed13b6d64b29b121d4 (patch) | |
| tree | 1e520f8a2781a4d0f4c240adb4bf3a7d1e2f1c0b | |
| parent | 81ef39bd8d6005c09d8245ab36ed87f38a4aa95c (diff) | |
| download | rockbox-bc748951b976342c2c0216ed13b6d64b29b121d4.zip rockbox-bc748951b976342c2c0216ed13b6d64b29b121d4.tar.gz rockbox-bc748951b976342c2c0216ed13b6d64b29b121d4.tar.bz2 rockbox-bc748951b976342c2c0216ed13b6d64b29b121d4.tar.xz | |
Fix building Rockbox Utility when using newer versions of libspeex.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23164 a1c6a512-1295-4272-9138-f99709370657
| -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 4b170cd..e705497 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro @@ -28,8 +28,11 @@ RBBASE_DIR = $$replace(RBBASE_DIR,/rbutil/rbutilqt,) message("Rockbox Base dir: "$$RBBASE_DIR) # check for system speex. Add a custom rule for pre-building librbspeex if not found. -LIBSPEEX = $$system(pkg-config --libs speex) -!static:!isEmpty(LIBSPEEX) { +LIBSPEEX = $$system(pkg-config --silence-errors --libs speex) +!static:!isEmpty(LIBSPEEX) + # newer versions of speex are split up into libspeex and libspeexdsp. + # avoid checking twice if libspeex is missing. + LIBSPEEX += $$system(pkg-config --silence-errors --libs speexdsp) LIBS += $$LIBSPEEX } !mac { diff --git a/tools/rbspeex/Makefile b/tools/rbspeex/Makefile index 8c46677..87ce08f 100644 --- a/tools/rbspeex/Makefile +++ b/tools/rbspeex/Makefile @@ -33,7 +33,10 @@ endif # don't try to use the systems libspeex when building a static binary. ifndef STATIC -SYS_SPEEX = $(shell pkg-config --libs speex) +SYS_SPEEX = $(shell pkg-config --silence-errors --libs speex) +ifneq ($(SYS_SPEEX),) +SYS_SPEEX += $(shell pkg-config --silence-errors --libs speexdsp) +endif endif # fall back to our own librbspeex if no suitable found. |