- Removed lines of "force to use C++ compiler" in some Symbian MMPs
- Updated symbian_ua UID
- Added compiler optimization flag in pjmedia_auddev.mmp
- Deleted obsolete symbain_audio_aps.mmp
git-svn-id: https://svn.pjsip.org/repos/pjproject/branches/projects/aps-direct@2490 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/build.symbian/pjlib.mmp b/build.symbian/pjlib.mmp
index db39667..3b2e9cf 100644
--- a/build.symbian/pjlib.mmp
+++ b/build.symbian/pjlib.mmp
@@ -19,10 +19,6 @@
SOURCEPATH ..\pjlib\src\pj
-OPTION CW -lang c++
-OPTION ARMCC --cpp
-OPTION GCC -x c++
-
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
diff --git a/build.symbian/pjlib_test.mmp b/build.symbian/pjlib_test.mmp
index 37c5c53..13783c2 100644
--- a/build.symbian/pjlib_test.mmp
+++ b/build.symbian/pjlib_test.mmp
@@ -15,10 +15,6 @@
STATICLIBRARY pjlib.lib
#endif
-OPTION CW -lang c++
-OPTION ARMCC --cpp
-OPTION GCC -x c++
-
// Test files
SOURCE activesock.c
diff --git a/build.symbian/pjlib_util.mmp b/build.symbian/pjlib_util.mmp
index efbb41c..c2d6ebe 100644
--- a/build.symbian/pjlib_util.mmp
+++ b/build.symbian/pjlib_util.mmp
@@ -22,10 +22,6 @@
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
-OPTION CW -lang c++
-OPTION ARMCC --cpp
-OPTION GCC -x c++
-
//
// PJLIB-UTIL files
//
diff --git a/build.symbian/pjmedia_audiodev.mmp b/build.symbian/pjmedia_audiodev.mmp
index ccabc2f..3bed275 100644
--- a/build.symbian/pjmedia_audiodev.mmp
+++ b/build.symbian/pjmedia_audiodev.mmp
@@ -6,7 +6,7 @@
//
// GCCE optimization setting
//
-//OPTION GCCE -O2 -fno-unit-at-a-time
+OPTION GCCE -O2 -fno-unit-at-a-time
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
diff --git a/build.symbian/pjnath.mmp b/build.symbian/pjnath.mmp
index 3060c4c..7168313 100644
--- a/build.symbian/pjnath.mmp
+++ b/build.symbian/pjnath.mmp
@@ -22,10 +22,6 @@
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
-OPTION CW -lang c++
-OPTION ARMCC --cpp
-OPTION GCC -x c++
-
//
// PJNATH files
//
diff --git a/build.symbian/pjsdp.mmp b/build.symbian/pjsdp.mmp
index 23c8bd3..e8b41b8 100644
--- a/build.symbian/pjsdp.mmp
+++ b/build.symbian/pjsdp.mmp
@@ -19,10 +19,6 @@
SOURCEPATH ..\pjmedia\src\pjmedia
-OPTION CW -lang c++
-OPTION ARMCC --cpp
-OPTION GCC -x c++
-
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
diff --git a/build.symbian/pjsip.mmp b/build.symbian/pjsip.mmp
index 8fb7d08..e3e2bc2 100644
--- a/build.symbian/pjsip.mmp
+++ b/build.symbian/pjsip.mmp
@@ -25,10 +25,6 @@
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
-OPTION CW -lang c++
-OPTION ARMCC --cpp
-OPTION GCC -x c++
-
// PJSIP-CORE files
//SOURCE sip_auth_aka.c
diff --git a/build.symbian/pjsip_simple.mmp b/build.symbian/pjsip_simple.mmp
index d44b0ca..b02d142 100644
--- a/build.symbian/pjsip_simple.mmp
+++ b/build.symbian/pjsip_simple.mmp
@@ -25,11 +25,6 @@
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
-OPTION CW -lang c++
-OPTION ARMCC --cpp
-OPTION GCC -x c++
-
-
// PJSIP-SIMPLE files
SOURCE errno.c
diff --git a/build.symbian/pjstun_client.mmp b/build.symbian/pjstun_client.mmp
index 37b855d..fedb7a2 100644
--- a/build.symbian/pjstun_client.mmp
+++ b/build.symbian/pjstun_client.mmp
@@ -7,10 +7,6 @@
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
-OPTION CW -lang c++
-OPTION ARMCC --cpp
-OPTION GCC -x c++
-
// PJSTUN-CLIENT files
SOURCE client_main.c
diff --git a/build.symbian/symbian_audio_aps.mmp b/build.symbian/symbian_audio_aps.mmp
deleted file mode 100644
index 85cb1e8..0000000
--- a/build.symbian/symbian_audio_aps.mmp
+++ /dev/null
@@ -1,20 +0,0 @@
-TARGET symbian_audio_aps.lib
-TARGETTYPE lib
-
-OPTION CW -lang c++
-OPTION GCCE -O2 -fno-unit-at-a-time
-
-MACRO PJ_M_I386=1
-MACRO PJ_SYMBIAN=1
-
-SYSTEMINCLUDE ..\pjmedia\include
-SYSTEMINCLUDE ..\pjlib\include
-
-SOURCEPATH ..\pjmedia\src\pjmedia
-SOURCE symbian_sound_aps.cpp
-
-SYSTEMINCLUDE \epoc32\include\mmf\server
-SYSTEMINCLUDE \epoc32\include\mmf\common
-SYSTEMINCLUDE \epoc32\include\mda\common
-SYSTEMINCLUDE \epoc32\include\libc
-SYSTEMINCLUDE \epoc32\include
diff --git a/build.symbian/symbian_ua.mmp b/build.symbian/symbian_ua.mmp
index 1a666c6..f2b832d 100644
--- a/build.symbian/symbian_ua.mmp
+++ b/build.symbian/symbian_ua.mmp
@@ -4,13 +4,16 @@
TARGET symbian_ua.exe
TARGETTYPE exe
-UID 0x0 0xA000000D
+UID 0x0 0x200235D3
SOURCEPATH ..\pjsip-apps\src\symbian_ua
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
+OPTION GCCE -O2 -fno-unit-at-a-time
+SRCDBG
+
// Source files
SOURCE ua.cpp
@@ -40,7 +43,7 @@
STATICLIBRARY pjmedia_audiodev.lib
#if SND_HAS_APS
-LIBRARY APSSession2.lib
+ LIBRARY APSSession2.lib
#endif
#if SND_HAS_VAS
@@ -53,7 +56,7 @@
#endif
#if SND_HAS_APS || SND_HAS_VAS
-CAPABILITY NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD
+ CAPABILITY NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD
#else
CAPABILITY NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment
#endif
@@ -66,5 +69,5 @@
// The default 8KB seems to be insufficient with all bells and
// whistles turned on
-EPOCSTACKSIZE 12288
+EPOCSTACKSIZE 12288