equal
deleted
inserted
replaced
77 -lapgrfx \ |
77 -lapgrfx \ |
78 -lapmime \ |
78 -lapmime \ |
79 -lecom \ |
79 -lecom \ |
80 -lcntmodel \ |
80 -lcntmodel \ |
81 -lQtCore \ |
81 -lQtCore \ |
82 -lnmailbase |
82 -lnmailbase \ |
|
83 -lnmutilities |
83 |
84 |
84 defBlock = \ |
85 defBlock = \ |
85 "$${LITERAL_HASH}if defined(MARM)" \ |
86 "$${LITERAL_HASH}if defined(MARM)" \ |
86 "DEFFILE eabi/fsfwcommonlib.def" \ |
87 "DEFFILE eabi/fsfwcommonlib.def" \ |
87 "$${LITERAL_HASH}else" \ |
88 "$${LITERAL_HASH}else" \ |
88 "DEFFILE bwins/fsfwcommonlib.def" \ |
89 "DEFFILE bwins/fsfwcommonlib.def" \ |
89 "$${LITERAL_HASH}endif" |
90 "$${LITERAL_HASH}endif" |
90 |
91 |
91 MMP_RULES += defBlock |
92 MMP_RULES += defBlock |
92 |
93 MMP_RULES += SMPSAFE |
93 MMP_RULES -= "OPTION_REPLACE ARMCC --export_all_vtbl -D__QT_NOEFFECTMACRO_DONOTUSE" |
94 MMP_RULES -= "OPTION_REPLACE ARMCC --export_all_vtbl -D__QT_NOEFFECTMACRO_DONOTUSE" |
94 } |
95 } |
95 |
96 |
96 win32 { |
97 win32 { |
97 DESTDIR = ../bin |
98 DESTDIR = ../bin |
98 } |
99 } |