diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-10-18 10:48:14 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-10-18 11:40:34 (GMT) |
| commit | 521df9e30df41b49da7d856c833946417ec4856b (patch) | |
| tree | f26fe3fe5ff727e0554d44074348f64cc7608552 | |
| parent | 6da7e5440285878dcd6fc21eb4485d42d24c6fa0 (diff) | |
| download | Qt-521df9e30df41b49da7d856c833946417ec4856b.zip Qt-521df9e30df41b49da7d856c833946417ec4856b.tar.gz Qt-521df9e30df41b49da7d856c833946417ec4856b.tar.bz2 | |
Prepend epocroot to extra target tools if they start with /epoc32/
This makes it possible to define extra targets and extra compilers
commands that use tools under EPOCROOT without having to worry
whether EPOCROOT contains drive letter or not, which is demanded
by sbsv2 toolchain.
For example, if command to be used is
"%EPOCROOT%epoc32/tools/foobar.exe", the EPOCROOT should be omitted
in .pro file and the command be given simply as
"/epoc32/tools/foobar.exe".
Reviewed-by: Janne Koskinen
| -rw-r--r-- | mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm index 1338515..2dc4028 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm +++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm @@ -12,6 +12,10 @@ SINGLETON:=$(call sanitise,TARGET_$(PREDEP_TARGET)) $(call makepathfor,$(PREDEP_TARGET)) +ifeq ($(patsubst /epoc32/%,MATCH,$(firstword $(COMMAND))),MATCH) +COMMAND:=$(EPOCROOT)$(COMMAND) +endif + define qmake_extra_pre_targetdep EXPORT:: $(PREDEP_TARGET) |