diff options
| author | axis <qt-info@nokia.com> | 2009-09-04 12:00:35 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-23 15:32:15 (GMT) |
| commit | b731981cc19195b54f8d5c4ebdf6a9f75b13f790 (patch) | |
| tree | 76c9b9c8e852bd98f2602cda9f1a325cb49b6d6c | |
| parent | bf0bbed5e1e0c450074d4cbbf40840e986018ccb (diff) | |
| download | Qt-b731981cc19195b54f8d5c4ebdf6a9f75b13f790.zip Qt-b731981cc19195b54f8d5c4ebdf6a9f75b13f790.tar.gz Qt-b731981cc19195b54f8d5c4ebdf6a9f75b13f790.tar.bz2 | |
Fixed some compiler flags and defines for the Symbian platform.
| -rw-r--r-- | mkspecs/common/armcc.conf | 4 | ||||
| -rw-r--r-- | mkspecs/symbian/linux-armcc/qmake.conf | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mkspecs/common/armcc.conf b/mkspecs/common/armcc.conf index 166d662..c9a518b 100644 --- a/mkspecs/common/armcc.conf +++ b/mkspecs/common/armcc.conf @@ -3,7 +3,7 @@ # QMAKE_CC = armcc -QMAKE_CFLAGS += --preinclude rvct2_2.h --diag_suppress 186,654,1300 +QMAKE_CFLAGS += QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += QMAKE_CFLAGS_WARN_OFF += -W @@ -31,7 +31,7 @@ QMAKE_LFLAGS += QMAKE_LFLAGS_RELEASE += QMAKE_LFLAGS_DEBUG += QMAKE_LFLAGS_APP += -QMAKE_LFLAGS_SHLIB += --shared +QMAKE_LFLAGS_SHLIB += QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_THREAD += diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf index 78bdacf..2a926dd 100644 --- a/mkspecs/symbian/linux-armcc/qmake.conf +++ b/mkspecs/symbian/linux-armcc/qmake.conf @@ -26,11 +26,13 @@ QMAKE_DEL_DIR = rmdir QMAKE_CHK_DIR_EXISTS = test -d QMAKE_MKDIR = mkdir -p -QMAKE_LFLAGS_SHLIB += --entry _E32Dll --partial --diag_suppress 6331,6780 +QMAKE_CFLAGS += --preinclude rvct2_2.h --diag_suppress 186,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --export_all_vtbl --no_vfe --apcs /inter --dllimport_runtime --gnu +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS --no_parse_templates +QMAKE_LFLAGS_SHLIB += --entry _E32Dll --diag_suppress 6331,6780 --shl --reloc --split --rw-base 0x400000 --noscanlib QT_ARCH = symbian -DEFINES += __SYMBIAN32__ EKA2 __S60_50__ __S60_3X__ __SERIES60_3X__ __EPOC32__ __MARM__ __EABI__ __ARMCC__ __ARMcc_2__ __ARMCC_2_2__ __MARM_ARMV5__ __DLL__ _UNICODE +DEFINES += __SYMBIAN32__ EKA2 __S60_50__ __S60_3X__ __SERIES60_3X__ __EPOC32__ __MARM__ __EABI__ __ARMCC__ __ARMcc_2__ __ARMCC_2_2__ __MARM_ARMV5__ __MARM_THUMB__ __MARM_INTERWORK__ __DLL__ _UNICODE __SUPPORT_CPP_EXCEPTIONS__ INCLUDEPATH += $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off |