diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index fc62e77241..0b03907a94 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro @@ -29,14 +29,6 @@ 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. 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. -LIBSPEEX = $$system(pkg-config --silence-errors --libs speex speexdsp) -!static:!isEmpty(LIBSPEEX) { - LIBS += $$LIBSPEEX -} # custom rules for rockbox-specific libs !mac { RBLIBPOSTFIX = .a @@ -187,6 +179,17 @@ DEPENDPATH = $$INCLUDEPATH LIBS += -L$$OUT_PWD -L$$MYBUILDDIR -lrbspeex -lmkamsboot -lmktccboot -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) +!static:!isEmpty(LIBSPEEX) { + LIBS += $$LIBSPEEX +} + TEMPLATE = app dbg { CONFIG += debug thread qt warn_on