Don't overwrite the build pretarget libspeex with lrelease. Make sure to use the lrelease binary from the current installation to prevent clashes on systems with Qt3 and Qt4 installed in parallel.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16201 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
dce2ef805c
commit
51f6fb56f1
1 changed files with 4 additions and 4 deletions
|
@ -14,13 +14,13 @@ RCC_DIR = build/rcc
|
||||||
|
|
||||||
# add a custom rule for pre-building librbspeex
|
# add a custom rule for pre-building librbspeex
|
||||||
rbspeex.commands = @$(MAKE) -C ../../tools/rbspeex librbspeex.a
|
rbspeex.commands = @$(MAKE) -C ../../tools/rbspeex librbspeex.a
|
||||||
QMAKE_EXTRA_TARGETS = rbspeex
|
QMAKE_EXTRA_TARGETS += rbspeex
|
||||||
PRE_TARGETDEPS = rbspeex
|
PRE_TARGETDEPS += rbspeex
|
||||||
|
|
||||||
# add a custom rule for makeing the translations
|
# add a custom rule for makeing the translations
|
||||||
lrelease.commands = lrelease rbutilqt.pro
|
lrelease.commands = $$[QT_INSTALL_BINS]/lrelease -silent rbutilqt.pro
|
||||||
QMAKE_EXTRA_TARGETS += lrelease
|
QMAKE_EXTRA_TARGETS += lrelease
|
||||||
PRE_TARGETDEPS = lrelease
|
PRE_TARGETDEPS += lrelease
|
||||||
|
|
||||||
|
|
||||||
SOURCES += rbutilqt.cpp \
|
SOURCES += rbutilqt.cpp \
|
||||||
|
|
Loading…
Reference in a new issue