Ticket #992: Symbian build issues using RVCT compiler (thanks Gabor Tanka for the fix)
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@3046 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/build.symbian/bld.inf b/build.symbian/bld.inf
index b516a1d..7e26998 100644
--- a/build.symbian/bld.inf
+++ b/build.symbian/bld.inf
@@ -1,6 +1,6 @@
prj_platforms
winscw
-//armv5
+armv5
gcce
prj_mmpfiles
@@ -30,7 +30,6 @@
pjmedia_audiodev.mmp
/* Applications */
-//pjlib_test.mmp
//symsndtest.mmp
symbian_ua.mmp
..\pjsip-apps\src\symbian_ua_gui\group\symbian_ua_gui.mmp
diff --git a/build.symbian/libg7221codec.mmp b/build.symbian/libg7221codec.mmp
index 95d3795..814fcae 100644
--- a/build.symbian/libg7221codec.mmp
+++ b/build.symbian/libg7221codec.mmp
@@ -3,6 +3,7 @@
//OPTION CW -lang c++
OPTION GCCE -O2 -fno-unit-at-a-time
+OPTION ARMCC --gnu
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
diff --git a/build.symbian/libgsmcodec.mmp b/build.symbian/libgsmcodec.mmp
index 754bcea..1b301f8 100644
--- a/build.symbian/libgsmcodec.mmp
+++ b/build.symbian/libgsmcodec.mmp
@@ -19,6 +19,7 @@
#endif
//OPTION CW -lang c++
+OPTION ARMCC --gnu
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
diff --git a/build.symbian/libpassthroughcodec.mmp b/build.symbian/libpassthroughcodec.mmp
index c4fb277..3a19117 100644
--- a/build.symbian/libpassthroughcodec.mmp
+++ b/build.symbian/libpassthroughcodec.mmp
@@ -9,6 +9,7 @@
// GCCE optimization setting
//
OPTION GCCE -O2 -fno-unit-at-a-time
+OPTION ARMCC --gnu
//
// Passthrough codecs wrapper for pjmedia-codec
diff --git a/build.symbian/libresample.mmp b/build.symbian/libresample.mmp
index 1498714..0dd074f 100644
--- a/build.symbian/libresample.mmp
+++ b/build.symbian/libresample.mmp
@@ -7,6 +7,7 @@
// GCCE optimization setting
//
OPTION GCCE -O2 -fno-unit-at-a-time
+OPTION ARMCC --gnu
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
diff --git a/build.symbian/libspeexcodec.mmp b/build.symbian/libspeexcodec.mmp
index 1be8a19..816d805 100644
--- a/build.symbian/libspeexcodec.mmp
+++ b/build.symbian/libspeexcodec.mmp
@@ -9,6 +9,7 @@
// GCCE optimization setting
//
OPTION GCCE -O2 -fno-unit-at-a-time
+OPTION ARMCC --gnu
//
// Speex files
diff --git a/build.symbian/libsrtp.mmp b/build.symbian/libsrtp.mmp
index 11384d2..4309e6d 100644
--- a/build.symbian/libsrtp.mmp
+++ b/build.symbian/libsrtp.mmp
@@ -8,6 +8,7 @@
// GCCE optimization setting
//
OPTION GCCE -O2 -fno-unit-at-a-time
+OPTION ARMCC --gnu
//
// Speex files
diff --git a/build.symbian/null_audio.mmp b/build.symbian/null_audio.mmp
index ea935bb..de1dcbd 100644
--- a/build.symbian/null_audio.mmp
+++ b/build.symbian/null_audio.mmp
@@ -22,6 +22,7 @@
SOURCEPATH ..\pjmedia\src\pjmedia
OPTION CW -lang c++
+OPTION ARMCC --gnu
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
diff --git a/build.symbian/pjlib.mmp b/build.symbian/pjlib.mmp
index 14576e3..65ffcc5 100644
--- a/build.symbian/pjlib.mmp
+++ b/build.symbian/pjlib.mmp
@@ -24,7 +24,7 @@
// Must compile as C++, otherwise exception would not work
OPTION CW -lang c++
-OPTION ARMCC --cpp
+OPTION ARMCC --cpp --gnu
OPTION GCC -x c++
OPTION GCCE -x c++
diff --git a/build.symbian/pjlib_test.mmp b/build.symbian/pjlib_test.mmp
index 462b118..e48a332 100644
--- a/build.symbian/pjlib_test.mmp
+++ b/build.symbian/pjlib_test.mmp
@@ -10,7 +10,7 @@
// Must compile as C++, otherwise exception would not work
OPTION CW -lang c++
-OPTION ARMCC --cpp
+OPTION ARMCC --cpp --gnu
OPTION GCC -x c++
OPTION GCCE -x c++
diff --git a/build.symbian/pjlib_util.mmp b/build.symbian/pjlib_util.mmp
index 5dac2f8..3eb3701 100644
--- a/build.symbian/pjlib_util.mmp
+++ b/build.symbian/pjlib_util.mmp
@@ -24,7 +24,7 @@
// Must compile as C++, otherwise exception would not work
OPTION CW -lang c++
-OPTION ARMCC --cpp
+OPTION ARMCC --cpp --gnu
OPTION GCC -x c++
OPTION GCCE -x c++
diff --git a/build.symbian/pjmedia.mmp b/build.symbian/pjmedia.mmp
index 7dd9fc7..b729343 100644
--- a/build.symbian/pjmedia.mmp
+++ b/build.symbian/pjmedia.mmp
@@ -30,7 +30,7 @@
// Must compile as C++, otherwise exception would not work
OPTION CW -lang c++
-OPTION ARMCC --cpp
+OPTION ARMCC --cpp --gnu
OPTION GCC -x c++
OPTION GCCE -x c++
diff --git a/build.symbian/pjmedia_audiodev.mmp b/build.symbian/pjmedia_audiodev.mmp
index da98b05..f4e25d2 100644
--- a/build.symbian/pjmedia_audiodev.mmp
+++ b/build.symbian/pjmedia_audiodev.mmp
@@ -7,6 +7,7 @@
// GCCE optimization setting
//
//OPTION GCCE -O2 -fno-unit-at-a-time
+OPTION ARMCC --gnu
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
diff --git a/build.symbian/pjnath.mmp b/build.symbian/pjnath.mmp
index 7168313..76b64dd 100644
--- a/build.symbian/pjnath.mmp
+++ b/build.symbian/pjnath.mmp
@@ -17,6 +17,8 @@
#endif
+OPTION ARMCC --gnu
+
SOURCEPATH ..\pjnath\src\pjnath
MACRO PJ_M_I386=1
diff --git a/build.symbian/pjsdp.mmp b/build.symbian/pjsdp.mmp
index 25f3db1..e165704 100644
--- a/build.symbian/pjsdp.mmp
+++ b/build.symbian/pjsdp.mmp
@@ -24,7 +24,7 @@
// Must compile as C++, otherwise exception would not work
OPTION CW -lang c++
-OPTION ARMCC --cpp
+OPTION ARMCC --cpp --gnu
OPTION GCC -x c++
OPTION GCCE -x c++
diff --git a/build.symbian/pjsip.mmp b/build.symbian/pjsip.mmp
index b74f4de..6269b47 100644
--- a/build.symbian/pjsip.mmp
+++ b/build.symbian/pjsip.mmp
@@ -27,7 +27,7 @@
// Must compile as C++, otherwise exception would not work
OPTION CW -lang c++
-OPTION ARMCC --cpp
+OPTION ARMCC --cpp --gnu
OPTION GCC -x c++
OPTION GCCE -x c++
diff --git a/build.symbian/pjsip_simple.mmp b/build.symbian/pjsip_simple.mmp
index b0d85dc..9b83a9d 100644
--- a/build.symbian/pjsip_simple.mmp
+++ b/build.symbian/pjsip_simple.mmp
@@ -27,7 +27,7 @@
// Must compile as C++, otherwise exception would not work
OPTION CW -lang c++
-OPTION ARMCC --cpp
+OPTION ARMCC --cpp --gnu
OPTION GCC -x c++
OPTION GCCE -x c++
diff --git a/build.symbian/pjsip_ua.mmp b/build.symbian/pjsip_ua.mmp
index 5929304..609c0a3 100644
--- a/build.symbian/pjsip_ua.mmp
+++ b/build.symbian/pjsip_ua.mmp
@@ -27,7 +27,7 @@
// Must compile as C++, otherwise exception would not work
OPTION CW -lang c++
-OPTION ARMCC --cpp
+OPTION ARMCC --cpp --gnu
OPTION GCC -x c++
OPTION GCCE -x c++
diff --git a/build.symbian/pjstun_client.mmp b/build.symbian/pjstun_client.mmp
index fedb7a2..6ca5eab 100644
--- a/build.symbian/pjstun_client.mmp
+++ b/build.symbian/pjstun_client.mmp
@@ -2,6 +2,8 @@
TARGETTYPE exe
UID 0x0 0xA000000A
+OPTION ARMCC --gnu
+
SOURCEPATH ..\pjnath\src\pjstun-client
MACRO PJ_M_I386=1
diff --git a/build.symbian/pjsua_lib.mmp b/build.symbian/pjsua_lib.mmp
index 0b19781..ee7c6b0 100644
--- a/build.symbian/pjsua_lib.mmp
+++ b/build.symbian/pjsua_lib.mmp
@@ -27,7 +27,7 @@
// Must compile as C++, otherwise exception would not work
OPTION CW -lang c++
-OPTION ARMCC --cpp
+OPTION ARMCC --cpp --gnu
OPTION GCC -x c++
OPTION GCCE -x c++
diff --git a/build.symbian/symbian_audio.mmp b/build.symbian/symbian_audio.mmp
index e53f4e8..bba9ce5 100644
--- a/build.symbian/symbian_audio.mmp
+++ b/build.symbian/symbian_audio.mmp
@@ -25,6 +25,7 @@
OPTION CW -lang c++
OPTION GCCE -O2 -fno-unit-at-a-time
+OPTION ARMCC --gnu
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
diff --git a/build.symbian/symbian_ua.mmp b/build.symbian/symbian_ua.mmp
index 60310ae..9514cde 100644
--- a/build.symbian/symbian_ua.mmp
+++ b/build.symbian/symbian_ua.mmp
@@ -9,6 +9,8 @@
SOURCEPATH ..\pjsip-apps\src\symbian_ua
+OPTION ARMCC --gnu
+
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
diff --git a/build.symbian/symsndtest.mmp b/build.symbian/symsndtest.mmp
index 415807d..c729e1c 100644
--- a/build.symbian/symsndtest.mmp
+++ b/build.symbian/symsndtest.mmp
@@ -5,6 +5,8 @@
TARGETTYPE exe
UID 0x0 0xA000000E
+OPTION ARMCC --gnu
+
SOURCEPATH ..\pjsip-apps\src\symsndtest
MACRO PJ_M_I386=1