diff options
| author | Kalle Juhani Lehtonen <kalle.ju.lehtonen@nokia.com> | 2011-04-06 11:42:46 +1000 |
|---|---|---|
| committer | Kalle Juhani Lehtonen <kalle.ju.lehtonen@nokia.com> | 2011-04-06 12:03:07 +1000 |
| commit | 1b814878e778fa852a18c3ee61846887427dd1aa (patch) | |
| tree | 330bf22a6b473837a8ec9b5d85012eb39e91ee20 | |
| parent | 8be4a30df45dc0d4f18c471e766473ce3a888d4f (diff) | |
Fix QMF compiling in Symbian
Native Symbian parts of QMF are not configured
to compile correctly. Instead of invoking compile
inside qmake processing of .pro file, add the
native project files to the normal compile sequence.
Also remove the redundant bld.inf to ensure there will
not be any mixups how the symbian projects are compiled.
The names of the symbian executables have been also changed
to lower case.
Change-Id: I30b5b7734d05d2f157ce5ebc409bb1df18b25dd8
| -rw-r--r-- | messagingframework.pro | 7 | ||||
| -rw-r--r-- | src/symbian/qmfdataserver/bld.inf | 5 | ||||
| -rw-r--r-- | src/symbian/qmfdataserver/qmfdataserver.mmp | 2 | ||||
| -rw-r--r-- | src/symbian/qmfipcchannelserver/bld.inf | 5 | ||||
| -rw-r--r-- | src/symbian/qmfipcchannelserver/qmfipcchannelserver.mmp | 2 |
5 files changed, 5 insertions, 16 deletions
diff --git a/messagingframework.pro b/messagingframework.pro index c88fd7e4..6aeb4bd4 100644 --- a/messagingframework.pro +++ b/messagingframework.pro @@ -25,10 +25,9 @@ SUBDIRS = src/libraries/qmfclient \ } symbian { - message("Building a pure Symbian Client-Server implementation for Data Server using Raptor...") - system(sbs -b src/symbian/qmfdataserver/bld.inf) - message("Building a pure Symbian Client-Server implementation for IPC Channel using Raptor...") - system(sbs -b src/symbian/qmfipcchannelserver/bld.inf) + # Add native Symbian compilations to list of projects to compile + BLD_INF_RULES.prj_mmpfiles += "src/symbian/qmfdataserver/qmfdataserver.mmp" + BLD_INF_RULES.prj_mmpfiles += "src/symbian/qmfipcchannelserver/qmfipcchannelserver.mmp" } defineReplace(targetPath) { diff --git a/src/symbian/qmfdataserver/bld.inf b/src/symbian/qmfdataserver/bld.inf deleted file mode 100644 index c7e8c9d7..00000000 --- a/src/symbian/qmfdataserver/bld.inf +++ /dev/null @@ -1,5 +0,0 @@ -prj_platforms -WINSCW GCCE ARMV5 ARMV6 - -prj_mmpfiles -qmfdataserver.mmp diff --git a/src/symbian/qmfdataserver/qmfdataserver.mmp b/src/symbian/qmfdataserver/qmfdataserver.mmp index cb9f680b..a04752f3 100644 --- a/src/symbian/qmfdataserver/qmfdataserver.mmp +++ b/src/symbian/qmfdataserver/qmfdataserver.mmp @@ -1,4 +1,4 @@ -TARGET QMFDataServer.exe +TARGET qmfdataserver.exe TARGETTYPE exe UID 0x1000007A 0x2003A67A diff --git a/src/symbian/qmfipcchannelserver/bld.inf b/src/symbian/qmfipcchannelserver/bld.inf deleted file mode 100644 index 6c91fb54..00000000 --- a/src/symbian/qmfipcchannelserver/bld.inf +++ /dev/null @@ -1,5 +0,0 @@ -prj_platforms -WINSCW GCCE ARMV5 ARMV6 - -prj_mmpfiles -qmfipcchannelserver.mmp diff --git a/src/symbian/qmfipcchannelserver/qmfipcchannelserver.mmp b/src/symbian/qmfipcchannelserver/qmfipcchannelserver.mmp index ee51e349..dd35a0b6 100644 --- a/src/symbian/qmfipcchannelserver/qmfipcchannelserver.mmp +++ b/src/symbian/qmfipcchannelserver/qmfipcchannelserver.mmp @@ -1,4 +1,4 @@ -TARGET QMFIPCChannelServer.exe +TARGET qmfipcchannelserver.exe TARGETTYPE exe UID 0x1000007A 0x2003A67B |