devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Extend project file message output and always run lrelease.

Browse source 
Check for lrelease and always try to run it if found. If not found show a
warning. This avoids build problems for certain setups which previously
required -config dbg to complete.

Change-Id: I60f0f49adc8455743afc5e4d23294ce0729f38d2
This commit is contained in:
Dominik Riebeling 2015-05-18 22:44:36 +02:00
parent 5db55387b9
commit a213c1828f
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
rbutil/rbutilqt/rbutilqt.pro
View file

@ -25,7 +25,7 @@ contains(QMAKE_CC,($$find(QMAKE_CC,.*gcc.*))) {
unix:!mac:!noccache { unix:!mac:!noccache {
CCACHE = $$system(which ccache) CCACHE = $$system(which ccache)
!isEmpty(CCACHE) { !isEmpty(CCACHE) {
message("using ccache") message("using ccache at $$CCACHE")
QMAKE_CXX = ccache $$QMAKE_CXX QMAKE_CXX = ccache $$QMAKE_CXX
QMAKE_CC = ccache $$QMAKE_CC QMAKE_CC = ccache $$QMAKE_CC
} }
@ -54,13 +54,13 @@ RCC_DIR = $$MYBUILDDIR/rcc
message("Qt >= 4.5 required!") message("Qt >= 4.5 required!")
!isEmpty(QT_VERSION) error("Qt found:" $$[QT_VERSION]) !isEmpty(QT_VERSION) error("Qt found:" $$[QT_VERSION])
} }
message("Qt version used:" $$VER) message("using Qt version $$VER at $$[QT_INSTALL_PREFIX]")
} }
RBBASE_DIR = $$_PRO_FILE_PWD_ RBBASE_DIR = $$_PRO_FILE_PWD_
RBBASE_DIR = $$replace(RBBASE_DIR,/rbutil/rbutilqt,) RBBASE_DIR = $$replace(RBBASE_DIR,/rbutil/rbutilqt,)
message("Rockbox Base dir: "$$RBBASE_DIR) message("using Rockbox basedir $$RBBASE_DIR")
# check for system speex. Add a custom rule for pre-building librbspeex if not # 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, # found. Newer versions of speex are split up into libspeex and libspeexdsp,
@ -105,11 +105,16 @@ tags.depends = $(SOURCES)
QMAKE_EXTRA_TARGETS += tags QMAKE_EXTRA_TARGETS += tags
# add a custom rule for making the translations # add a custom rule for making the translations
lrelease.commands = $$[QT_INSTALL_BINS]/lrelease -silent $$_PRO_FILE_ LRELEASE = $$system(which $$[QT_INSTALL_BINS]/lrelease)
lrelease.commands = $$LRELEASE -silent $$_PRO_FILE_
QMAKE_EXTRA_TARGETS += lrelease QMAKE_EXTRA_TARGETS += lrelease
!dbg { !isEmpty(LRELEASE) {
message("using lrelease at $$LRELEASE")
PRE_TARGETDEPS += lrelease PRE_TARGETDEPS += lrelease
} }
isEmpty(LRELEASE) {
warning("could not find lrelease. Skipping translations.")
}
# Needed by QT on Win # Needed by QT on Win
INCLUDEPATH += $$_PRO_FILE_PWD_ $$_PRO_FILE_PWD_/irivertools \ INCLUDEPATH += $$_PRO_FILE_PWD_ $$_PRO_FILE_PWD_/irivertools \
@ -155,12 +160,12 @@ contains(QT_MAJOR_VERSION, 5) {
dbg { dbg {
CONFIG += debug thread qt warn_on CONFIG += debug thread qt warn_on
DEFINES += DBG DEFINES += DBG
message("debug") message("creating debug version")
} }
!dbg { !dbg {
CONFIG += release thread qt CONFIG += release thread qt
DEFINES += NODEBUG DEFINES += NODEBUG
message("release") message("creating release version")
} }
DEFINES += RBUTIL _LARGEFILE64_SOURCE DEFINES += RBUTIL _LARGEFILE64_SOURCE