summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-09-04 08:48:38 (GMT)
committeraxis <qt-info@nokia.com>2009-10-23 15:32:21 (GMT)
commitec7009af05cc91797ac90292add5e4dd5cea2973 (patch)
treed552c4c63e4d2a27c350e00e2d87d052a7d5b607 /mkspecs
parent8782f3387bcd1dff3d44ae17ab0547ce08478fb1 (diff)
downloadQt-ec7009af05cc91797ac90292add5e4dd5cea2973.zip
Qt-ec7009af05cc91797ac90292add5e4dd5cea2973.tar.gz
Qt-ec7009af05cc91797ac90292add5e4dd5cea2973.tar.bz2
Changed the generation of def files and ordinal maps.
Instead of just creating a list, we now create a complete def file using makedeffile and then create the ordinal map from that. In addition we make an exp file, in the same way that Symbian does.
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/symbian/linux-armcc/features/default_post.prf20
1 files changed, 16 insertions, 4 deletions
diff --git a/mkspecs/symbian/linux-armcc/features/default_post.prf b/mkspecs/symbian/linux-armcc/features/default_post.prf
index 1d8f565..d575737 100644
--- a/mkspecs/symbian/linux-armcc/features/default_post.prf
+++ b/mkspecs/symbian/linux-armcc/features/default_post.prf
@@ -4,11 +4,23 @@ exports.input = OBJECTS
exports.variable_out = ORDINALMAP
exports.CONFIG = no_link
-ordinalmap.input = ORDINALMAP
+deffile.input = ORDINALMAP
+deffile.output = $$OBJECTS_DIR/$${TARGET}.def
+deffile.commands = makedeffile $$OBJECTS_DIR/$${TARGET}.def ${QMAKE_FILE_NAME}
+deffile.variable_out = DEFFILE
+deffile.CONFIG = no_link combine
+
+expfile.input = DEFFILE
+expfile.output = $$OBJECTS_DIR/$${TARGET}.exp
+expfile.commands = makeexpfile ${QMAKE_FILE_NAME} $$OBJECTS_DIR/$${TARGET}.exp
+expfile.variable_out = PRE_TARGETDEPS
+
+ordinalmap.input = DEFFILE
ordinalmap.output = $$OBJECTS_DIR/$${TARGET}.lib
-ordinalmap.commands = makeordinalmap $$OBJECTS_DIR $$OBJECTS_DIR/$${TARGET}.lib $${TARGET}.dll ${QMAKE_FILE_NAME}
+ordinalmap.commands = makeordinalmap $$OBJECTS_DIR ${QMAKE_FILE_NAME} $${TARGET}.dll $$OBJECTS_DIR/$${TARGET}.lib
ordinalmap.variable_out = PRE_TARGETDEPS
-ordinalmap.CONFIG = combine
-QMAKE_EXTRA_COMPILERS += ordinalmap
QMAKE_EXTRA_COMPILERS += exports
+QMAKE_EXTRA_COMPILERS += deffile
+QMAKE_EXTRA_COMPILERS += expfile
+QMAKE_EXTRA_COMPILERS += ordinalmap