summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2009-10-08 21:26:39 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2009-10-08 21:26:39 +0000
commit21a712cba1e49eea5a141b441b62a41965bd380e (patch)
tree6707ce35590811dc452847178a0fb50be335e864 /rbutil/rbutilqt
parentdf4f9710ba39b4c8e55ac011b0e88074dfe111ac (diff)
downloadrockbox-21a712cba1e49eea5a141b441b62a41965bd380e.tar.gz
rockbox-21a712cba1e49eea5a141b441b62a41965bd380e.zip
If available, use the systems libspeex when linking rbspeex(enc|dec) and rbutil dynamically. This is similar to FS#9233 but utilizes pkg-config.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23016 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt')
-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 df542be84a..fb306d9774 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -1,5 +1,4 @@
1 1
2
3# ccache 2# ccache
4unix:!mac:!noccache { 3unix:!mac:!noccache {
5 CCACHE = $$system(which ccache) 4 CCACHE = $$system(which ccache)
@@ -28,7 +27,11 @@ RBBASE_DIR = $$replace(RBBASE_DIR,/rbutil/rbutilqt,)
28 27
29message("Rockbox Base dir: "$$RBBASE_DIR) 28message("Rockbox Base dir: "$$RBBASE_DIR)
30 29
31# add a custom rule for pre-building librbspeex 30# check for system speex. Add a custom rule for pre-building librbspeex if not found.
31LIBSPEEX = $$system(pkg-config --libs speex)
32!static:!isEmpty(LIBSPEEX) {
33 LIBS += $$LIBSPEEX
34}
32!mac { 35!mac {
33rbspeex.commands = @$(MAKE) TARGET_DIR=$$OUT_PWD/ -C $$RBBASE_DIR/tools/rbspeex librbspeex.a 36rbspeex.commands = @$(MAKE) TARGET_DIR=$$OUT_PWD/ -C $$RBBASE_DIR/tools/rbspeex librbspeex.a
34} 37}