summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2009-10-13 20:53:25 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2009-10-13 20:53:25 +0000
commitbc748951b976342c2c0216ed13b6d64b29b121d4 (patch)
tree1e520f8a2781a4d0f4c240adb4bf3a7d1e2f1c0b /rbutil
parent81ef39bd8d6005c09d8245ab36ed87f38a4aa95c (diff)
downloadrockbox-bc748951b976342c2c0216ed13b6d64b29b121d4.tar.gz
rockbox-bc748951b976342c2c0216ed13b6d64b29b121d4.tar.bz2
rockbox-bc748951b976342c2c0216ed13b6d64b29b121d4.zip
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
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro7
1 files changed, 5 insertions, 2 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,)
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 {