diff options
| author | axis <qt-info@nokia.com> | 2009-10-23 14:29:32 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-23 15:32:25 (GMT) |
| commit | 6475ca960a3d04eb591338801073db4d2a38b715 (patch) | |
| tree | 50822d7248c7dbb60da5ff9c3fbe18c87e35bbbf | |
| parent | 733c7232f2c9656c26bfe668c2e95f9c93cceb4b (diff) | |
| download | Qt-6475ca960a3d04eb591338801073db4d2a38b715.zip Qt-6475ca960a3d04eb591338801073db4d2a38b715.tar.gz Qt-6475ca960a3d04eb591338801073db4d2a38b715.tar.bz2 | |
Switched to using just QMAKE_POST_LINK for elftran.
| -rw-r--r-- | mkspecs/symbian/linux-armcc/features/default_post.prf | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/mkspecs/symbian/linux-armcc/features/default_post.prf b/mkspecs/symbian/linux-armcc/features/default_post.prf index 5645637..c2b2c10 100644 --- a/mkspecs/symbian/linux-armcc/features/default_post.prf +++ b/mkspecs/symbian/linux-armcc/features/default_post.prf @@ -26,29 +26,22 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) { ordinalmap.commands = makeordinalmap $$OBJECTS_DIR ${QMAKE_FILE_NAME} $${TARGET}.dll $$DESTDIR/$${TARGET}.lib ordinalmap.variable_out = PRE_TARGETDEPS - elftran.target = $${DESTDIR}/lib$${TARGET}.tran - elftran.commands = winewrapper elftran.exe -version 4.1536 -sid 0xe001b2dc -allow -nocall -heap 0x00020000 0x00800000 -stack 0x00014000 -unpaged -uid1 0x10000079 -uid2 0x1000008d -uid3 0xe001b2dc -fpu softvfp -capability All-Tcb $${DESTDIR}/lib$${TARGET}.dll $${DESTDIR}/lib$${TARGET}.tran - elftran.depends = $${DESTDIR}/lib$${TARGET}.dll - QMAKE_POST_LINK += winewrapper elftran.exe -version 4.1536 -sid 0xe001b2dc -allow -nocall -heap 0x00020000 0x00800000 -stack 0x00014000 -unpaged -uid1 0x10000079 -uid2 0x1000008d -uid3 0xe001b2dc -fpu softvfp -capability All-Tcb $${DESTDIR}/lib$${TARGET}.dll $${DESTDIR}/lib$${TARGET}.tran - QMAKE_CLEAN += $${DESTDIR}/lib$${TARGET}.tran + !isEmpty($$QMAKE_POST_LINK):QMAKE_POST_LINK += && + QMAKE_POST_LINK += $$QMAKE_MOVE $$DESTDIR/$${TARGET}.dll $$DESTDIR/$${TARGET}.sym + QMAKE_POST_LINK += && winewrapper elftran.exe -version 4.1536 -sid 0xe001b2dc -allow -nocall -heap 0x00020000 0x00800000 -stack 0x00014000 -unpaged -uid1 0x10000079 -uid2 0x1000008d -uid3 0xe001b2dc -fpu softvfp -capability None $${DESTDIR}/$${TARGET}.sym $${DESTDIR}/$${TARGET}.dll + QMAKE_DISTCLEAN += $${DESTDIR}/$${TARGET}.sym QMAKE_EXTRA_COMPILERS += exports QMAKE_EXTRA_COMPILERS += deffile QMAKE_EXTRA_COMPILERS += expfile QMAKE_EXTRA_COMPILERS += ordinalmap - QMAKE_EXTRA_TARGETS += elftran QMAKE_LIBS += -ledllstub -ledll.lib\\(uc_dll_.o\\) } contains(TEMPLATE, app) { - elftran.target = $${DESTDIR}/$${TARGET}.tran - elftran.commands = winewrapper elftran.exe -version 10.0 -sid 0xe4d10fc9 -nocall -heap 0x00020000 0x00800000 -stack 0x00014000 -unpaged -uid1 0x1000007a -uid2 0x1000008d -uid3 0xe4d10fc9 -fpu softvfp -capability None $${DESTDIR}/$${TARGET} $${DESTDIR}/$${TARGET}.tran - elftran.depends = $${DESTDIR}/$${TARGET} QMAKE_POST_LINK += winewrapper elftran.exe -version 10.0 -sid 0xe4d10fc9 -nocall -heap 0x00020000 0x00800000 -stack 0x00014000 -unpaged -uid1 0x1000007a -uid2 0x1000008d -uid3 0xe4d10fc9 -fpu softvfp -capability None $${DESTDIR}/$${TARGET} $${DESTDIR}/$${TARGET}.tran - QMAKE_CLEAN += $${DESTDIR}/$${TARGET}.tran - - QMAKE_EXTRA_TARGETS += elftran + QMAKE_DISTCLEAN += $${DESTDIR}/$${TARGET}.tran QMAKE_LIBS += -leexe.lib\\(uc_exe_.o\\) } |