diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-02-25 09:57:47 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-02-25 09:57:47 (GMT) |
| commit | 83ea537b8e4e3ebd56c61b5fa1b5e306252476df (patch) | |
| tree | ba5009e29bbc1bc99ad01bfba71cd3315fd3e40c /mkspecs | |
| parent | e9ea8cf1332a741eb4e4d115b96d89ff146f850f (diff) | |
| download | Qt-83ea537b8e4e3ebd56c61b5fa1b5e306252476df.zip Qt-83ea537b8e4e3ebd56c61b5fa1b5e306252476df.tar.gz Qt-83ea537b8e4e3ebd56c61b5fa1b5e306252476df.tar.bz2 | |
Found a way to not hardcode the paths for dso / lib files
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/symbian/linux-gcce/features/symbian_building.prf | 8 | ||||
| -rw-r--r-- | mkspecs/symbian/linux-gcce/platformlibs.conf | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/symbian/linux-gcce/features/symbian_building.prf b/mkspecs/symbian/linux-gcce/features/symbian_building.prf index 168b08b..21c412c 100644 --- a/mkspecs/symbian/linux-gcce/features/symbian_building.prf +++ b/mkspecs/symbian/linux-gcce/features/symbian_building.prf @@ -31,7 +31,7 @@ for(library, LIBS) { library = $$replace(library, "^-l", "") isFullName = $$find(library, \.) isEmpty(isFullName):library="$${library}.dso" - newLIBS += "${EPOCROOT}epoc32/release/armv5/lib/$${library}" + newLIBS += "-l:$${library}" } LIBS = $$newLIBS newLIBS = @@ -41,7 +41,7 @@ for(library, QMAKE_LIBS) { library = $$replace(library, "^-l", "") isFullName = $$find(library, \.) isEmpty(isFullName):library="$${library}.dso" - newLIBS += "${EPOCROOT}epoc32/release/armv5/lib/$${library}" + newLIBS += "-l:$${library}" } QMAKE_LIBS = $$newLIBS @@ -102,8 +102,8 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) { QMAKE_DISTCLEAN += $${symbianDestdir}/$${TARGET}.dso QMAKE_CLEAN += $${symbianObjdir}/$${TARGET}.def - QMAKE_LIBS += ${EPOCROOT}/epoc32/release/armv5/udeb/edllstub.lib \ - ${EPOCROOT}/epoc32/release/armv5/udeb/edll.lib \ + QMAKE_LIBS += -l:edllstub.lib \ + -l:edll.lib \ -lsupc++ \ -lgcc diff --git a/mkspecs/symbian/linux-gcce/platformlibs.conf b/mkspecs/symbian/linux-gcce/platformlibs.conf index d31b793..4651d1e 100644 --- a/mkspecs/symbian/linux-gcce/platformlibs.conf +++ b/mkspecs/symbian/linux-gcce/platformlibs.conf @@ -1,4 +1,4 @@ -QMAKE_LIBS += "-\\( ${EPOCROOT}epoc32/release/armv5/udeb/usrt2_2.lib -\\)" +QMAKE_LIBS += -l:usrt2_2.lib QMAKE_LIBDIR += ${EPOCROOT}/epoc32/release/armv5/udeb/ |