summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2010-09-05 10:27:39 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2010-09-05 10:27:39 +0000
commitd71d537b17f8a3cf385a6523b4d22458831a4afe (patch)
tree166d3d4ec34163848031c9483d62bb25ecae8e69 /rbutil/rbutilqt
parentdbde63bfecc54b9d6402c81bf2bb32b78ec64d08 (diff)
downloadrockbox-d71d537b17f8a3cf385a6523b4d22458831a4afe.tar.gz
rockbox-d71d537b17f8a3cf385a6523b4d22458831a4afe.tar.bz2
rockbox-d71d537b17f8a3cf385a6523b4d22458831a4afe.zip
Don't search for libspeex on Windows and Mac.
Make sure to not try to dynamically link libspeex on Mac, since it's not a standard library, and application bundles aren't statically linked anyway. Remove looking up libspeex on Windows since it's not a standard library there either. Don't search for libspeex multiple times but instead pass it to the librbspeex Makefile. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27999 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro25
1 files changed, 17 insertions, 8 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index 16d7144729..ec440ab199 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -51,9 +51,24 @@ message("Rockbox Base dir: "$$RBBASE_DIR)
mac {
RBLIBPOSTFIX = -universal
}
+# check for system speex. Add a custom rule for pre-building librbspeex if not
+# found. Newer versions of speex are split up into libspeex and libspeexdsp,
+# and some distributions package them separately. Check for both and fall back
+# to librbspeex if not found.
+# NOTE: keep adding the linker option after -lrbspeex, otherwise linker errors
+# occur if the linker defaults to --as-needed
+# (see http://www.gentoo.org/proj/en/qa/asneeded.xml)
+#
+# Always use our own copy when building statically. Don't search for libspeex
+# on Mac, since we don't deploy statically there.
+!static:unix:!mac {
+ LIBSPEEX = $$system(pkg-config --silence-errors --libs speex speexdsp)
+}
+
rbspeex.commands = @$(MAKE) \
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex \
- librbspeex$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\"
+ librbspeex$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\" \
+ SYS_SPEEX=\"$$LIBSPEEX\"
libucl.commands = @$(MAKE) \
TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src \
libucl$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\"
@@ -91,13 +106,7 @@ DEPENDPATH = $$INCLUDEPATH
LIBS += -L$$OUT_PWD -L$$MYBUILDDIR -lrbspeex -lmkamsboot -lmktccboot -lmkmpioboot -lucl
-# check for system speex. Add a custom rule for pre-building librbspeex if not
-# found. Newer versions of speex are split up into libspeex and libspeexdsp,
-# and some distributions package them separately. Check for both and fall back
-# to librbspeex if not found.
-# NOTE: keep this after -lrbspeex, otherwise linker errors occur if the linker
-# defaults to --as-needed (see http://www.gentoo.org/proj/en/qa/asneeded.xml)
-LIBSPEEX = $$system(pkg-config --silence-errors --libs speex speexdsp)
+# Add a (possibly found) libspeex now, don't do this before -lrbspeex!
!static:!isEmpty(LIBSPEEX) {
LIBS += $$LIBSPEEX
}