diff options
| author | Liang Qi <liang.qi@nokia.com> | 2010-11-18 09:15:34 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2010-11-18 09:25:43 (GMT) |
| commit | e15bb1372950de7141f9f980f36ffa8037a4d2a8 (patch) | |
| tree | 731d616ce458dfd12a78af86be2f0b2a7ff50c1a /mkspecs/symbian-gcce | |
| parent | 506c4285213c8da30f16a3b94b8e8ffdcab444e2 (diff) | |
| download | Qt-e15bb1372950de7141f9f980f36ffa8037a4d2a8.zip Qt-e15bb1372950de7141f9f980f36ffa8037a4d2a8.tar.gz Qt-e15bb1372950de7141f9f980f36ffa8037a4d2a8.tar.bz2 | |
Unified the usage of $${EPOCROOT} for symbian.
RevBy: Miikka Heikkinen
Diffstat (limited to 'mkspecs/symbian-gcce')
| -rw-r--r-- | mkspecs/symbian-gcce/qmake.conf | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mkspecs/symbian-gcce/qmake.conf b/mkspecs/symbian-gcce/qmake.conf index 02ad626..5b9dcb8 100644 --- a/mkspecs/symbian-gcce/qmake.conf +++ b/mkspecs/symbian-gcce/qmake.conf @@ -58,19 +58,19 @@ QMAKE_LFLAGS_APP += --entry=_E32Startup -u _E32Startup 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 +gcceExtraFlags = --include=$${EPOCROOT}epoc32/include/gcce/gcce.h -march=armv5t -mapcs -mthumb-interwork -nostdinc -c -msoft-float -T script QMAKE_CFLAGS += $${gcceExtraFlags} QMAKE_CXXFLAGS += $${gcceExtraFlags} -x c++ -fexceptions -fno-unit-at-a-time -fvisibility-inlines-hidden #If we are not going to link to Qt or qtmain.lib, we need to include this at least once. isEmpty(QT):contains(TEMPLATE, app) { - QMAKE_CXXFLAGS += --include=${EPOCROOT}/epoc32/include/stdapis/staticlibinit_gcce.h + QMAKE_CXXFLAGS += --include=$${EPOCROOT}epoc32/include/stdapis/staticlibinit_gcce.h } QMAKE_LFLAGS += --target1-abs \ --no-undefined \ --nostdlib -QMAKE_LIBDIR += ${EPOCROOT}/epoc32/release/armv5/udeb/ +QMAKE_LIBDIR += $${EPOCROOT}epoc32/release/armv5/udeb/ # g++ knows the path to the gcc-shipped-libs, ld doesn't. So cache the full path in the generate Makefile QMAKE_GCC_SEARCH_DIRS =$$system($$QMAKE_CXX -print-search-dirs) @@ -84,13 +84,13 @@ for(line, QMAKE_GCC_SEARCH_DIRS) { } } -QMAKE_LIBDIR += $${EPOCROOT}/epoc32/release/armv5/lib +QMAKE_LIBDIR += $${EPOCROOT}epoc32/release/armv5/lib -INCLUDEPATH = ${EPOCROOT}/epoc32/include/ \ - $${EPOCROOT}/epoc32/include/variant \ - $${EPOCROOT}/epoc32/include/stdapis \ - $${EPOCROOT}/epoc32/include/gcce \ - ${EPOCROOT}/epoc32/include/stdapis/sys \ - ${EPOCROOT}/epoc32/include/stdapis/stlport \ +INCLUDEPATH = $${EPOCROOT}epoc32/include/ \ + $${EPOCROOT}epoc32/include/variant \ + $${EPOCROOT}epoc32/include/stdapis \ + $${EPOCROOT}epoc32/include/gcce \ + $${EPOCROOT}epoc32/include/stdapis/sys \ + $${EPOCROOT}epoc32/include/stdapis/stlport \ $$INCLUDEPATH |