diff options
| author | Liang Qi <liang.qi@nokia.com> | 2010-10-27 12:12:16 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2010-10-27 12:12:16 (GMT) |
| commit | 23643a0755b3ce787b33efaf55009ff134756835 (patch) | |
| tree | 7a410fe6fe6c437b5999120120527f833a26e9bc | |
| parent | 2925995de32f76a72fcdd7d577e609a68a517fa1 (diff) | |
| download | Qt-23643a0755b3ce787b33efaf55009ff134756835.zip Qt-23643a0755b3ce787b33efaf55009ff134756835.tar.gz Qt-23643a0755b3ce787b33efaf55009ff134756835.tar.bz2 | |
Fix some build issues for building Qt for Symbian on Mac OS X.
Need to add edllstub.lib and change a bit because some refactored work for mkspecs in 86636e0c4ab91bfb60be1e18d6daff34d41a5927.
RevBy: axis
| -rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 1 | ||||
| -rw-r--r-- | mkspecs/symbian-gcce/qmake.conf | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index a2791a1..c681ebb 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -155,6 +155,7 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) { } } else :symbian-gcce { LIBS += \ + -l:edllstub.lib \ -l:edll.lib \ -l:usrt2_2.lib \ -l:dfpaeabi.dso \ diff --git a/mkspecs/symbian-gcce/qmake.conf b/mkspecs/symbian-gcce/qmake.conf index f012217..9aff4e5 100644 --- a/mkspecs/symbian-gcce/qmake.conf +++ b/mkspecs/symbian-gcce/qmake.conf @@ -4,6 +4,7 @@ include(../common/symbian/symbian-makefile.conf) +include(../common/gcc-base.conf) include(../common/g++.conf) QMAKE_CC = arm-none-symbianelf-gcc @@ -54,7 +55,7 @@ DEFINES += __GCCE__ \ _STLP_NO_EXCEPTION_HEADER QMAKE_LFLAGS_APP += --entry=_E32Startup -u _E32Startup -QMAKE_LFLAGS_SHLIB += --default-symver --entry _E32Dll +QMAKE_LFLAGS_SHLIB += -shared --default-symver --entry _E32Dll QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB gcceExtraFlags = --include=${EPOCROOT}/epoc32/include/gcce/gcce.h -march=armv5t -mapcs -mthumb-interwork -nostdinc -c -msoft-float -T script |