diff options
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 7 | ||||
| -rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 18 |
2 files changed, 14 insertions, 11 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 1865ff3..bd5768b 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -74,12 +74,7 @@ QMAKE_LIBS_OPENGL = QMAKE_LIBS_OPENVG = -llibOpenVG -lfbscli -lbitgdi -lgdi QMAKE_LIBS_THREAD = -llibpthread QMAKE_LIBS_COMPAT = -linux-gcce { - QMAKE_LIBS_QT_ENTRY = -llibcrt0_gcce.lib - contains(TEMPLATE, ".*app"):QMAKE_LIBS_QT_ENTRY += -leexe.lib -} else { - QMAKE_LIBS_QT_ENTRY = -llibcrt0.lib -} +QMAKE_LIBS_QT_ENTRY = -llibcrt0.lib QMAKE_LIBS_S60 = -lavkon exists($${EPOCROOT}epoc32/include/platform/sgresource/sgimage.h) { diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index de254b9..a097771 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -160,20 +160,28 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@.*") { linux-armcc: { QMAKE_LIBS += -leexe.lib\\(uc_exe_.o\\) + contains(CONFIG, "qt"):contains(QT, "core") { #if linking with QtCore + QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib + } else { + QMAKE_LIBS += -llibcrt0.lib + } } else :linux-gcce { + # notice that we can't merge these as ordering of arguments is important. QMAKE_LIBS += \ -l:eexe.lib \ - -l:usrt2_2.lib \ - -l:qtmain.lib \ + -l:usrt2_2.lib + contains(CONFIG, "qt"):contains(QT, "core") { #if linking with QtCore + QMAKE_LIBS += -l:qtmain$${QT_LIBINFIX}.lib + } else { + QMAKE_LIBS += -l:libcrt0_gcce.lib + } + QMAKE_LIBS += \ -l:dfpaeabi.dso \ -l:drtaeabi.dso \ -l:scppnwdl.dso \ -lsupc++ \ -lgcc QMAKE_LFLAGS += --shared - isEmpty(QT) { # we need QtCore for this. - QMAKE_LIBS -= -l:qtmain.lib - } } QMAKE_LFLAGS += --soname $${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].exe |