diff options
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.pro')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 25 |
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) | |||
51 | mac { | 51 | mac { |
52 | RBLIBPOSTFIX = -universal | 52 | RBLIBPOSTFIX = -universal |
53 | } | 53 | } |
54 | # check for system speex. Add a custom rule for pre-building librbspeex if not | ||
55 | # found. Newer versions of speex are split up into libspeex and libspeexdsp, | ||
56 | # and some distributions package them separately. Check for both and fall back | ||
57 | # to librbspeex if not found. | ||
58 | # NOTE: keep adding the linker option after -lrbspeex, otherwise linker errors | ||
59 | # occur if the linker defaults to --as-needed | ||
60 | # (see http://www.gentoo.org/proj/en/qa/asneeded.xml) | ||
61 | # | ||
62 | # Always use our own copy when building statically. Don't search for libspeex | ||
63 | # on Mac, since we don't deploy statically there. | ||
64 | !static:unix:!mac { | ||
65 | LIBSPEEX = $$system(pkg-config --silence-errors --libs speex speexdsp) | ||
66 | } | ||
67 | |||
54 | rbspeex.commands = @$(MAKE) \ | 68 | rbspeex.commands = @$(MAKE) \ |
55 | TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex \ | 69 | TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/rbspeex \ |
56 | librbspeex$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\" | 70 | librbspeex$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\" \ |
71 | SYS_SPEEX=\"$$LIBSPEEX\" | ||
57 | libucl.commands = @$(MAKE) \ | 72 | libucl.commands = @$(MAKE) \ |
58 | TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src \ | 73 | TARGET_DIR=$$MYBUILDDIR -C $$RBBASE_DIR/tools/ucl/src \ |
59 | libucl$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\" | 74 | libucl$$RBLIBPOSTFIX CC=\"$$QMAKE_CC\" |
@@ -91,13 +106,7 @@ DEPENDPATH = $$INCLUDEPATH | |||
91 | 106 | ||
92 | LIBS += -L$$OUT_PWD -L$$MYBUILDDIR -lrbspeex -lmkamsboot -lmktccboot -lmkmpioboot -lucl | 107 | LIBS += -L$$OUT_PWD -L$$MYBUILDDIR -lrbspeex -lmkamsboot -lmktccboot -lmkmpioboot -lucl |
93 | 108 | ||
94 | # check for system speex. Add a custom rule for pre-building librbspeex if not | 109 | # Add a (possibly found) libspeex now, don't do this before -lrbspeex! |
95 | # found. Newer versions of speex are split up into libspeex and libspeexdsp, | ||
96 | # and some distributions package them separately. Check for both and fall back | ||
97 | # to librbspeex if not found. | ||
98 | # NOTE: keep this after -lrbspeex, otherwise linker errors occur if the linker | ||
99 | # defaults to --as-needed (see http://www.gentoo.org/proj/en/qa/asneeded.xml) | ||
100 | LIBSPEEX = $$system(pkg-config --silence-errors --libs speex speexdsp) | ||
101 | !static:!isEmpty(LIBSPEEX) { | 110 | !static:!isEmpty(LIBSPEEX) { |
102 | LIBS += $$LIBSPEEX | 111 | LIBS += $$LIBSPEEX |
103 | } | 112 | } |