From 50aba46a7d97ae0d4cad9d5b9374fbbe5210b3f2 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Wed, 6 Jan 2010 08:34:41 +0000 Subject: Ticket #992: Symbian build issues using RVCT compiler (thanks Gabor Tanka for the fix) git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3046 74dad513-b988-da41-8d7b-12977e46ad98 --- build.symbian/bld.inf | 3 +-- build.symbian/libg7221codec.mmp | 1 + build.symbian/libgsmcodec.mmp | 1 + build.symbian/libpassthroughcodec.mmp | 1 + build.symbian/libresample.mmp | 1 + build.symbian/libspeexcodec.mmp | 1 + build.symbian/libsrtp.mmp | 1 + build.symbian/null_audio.mmp | 1 + build.symbian/pjlib.mmp | 2 +- build.symbian/pjlib_test.mmp | 2 +- build.symbian/pjlib_util.mmp | 2 +- build.symbian/pjmedia.mmp | 2 +- build.symbian/pjmedia_audiodev.mmp | 1 + build.symbian/pjnath.mmp | 2 ++ build.symbian/pjsdp.mmp | 2 +- build.symbian/pjsip.mmp | 2 +- build.symbian/pjsip_simple.mmp | 2 +- build.symbian/pjsip_ua.mmp | 2 +- build.symbian/pjstun_client.mmp | 2 ++ build.symbian/pjsua_lib.mmp | 2 +- build.symbian/symbian_audio.mmp | 1 + build.symbian/symbian_ua.mmp | 2 ++ build.symbian/symsndtest.mmp | 2 ++ 23 files changed, 27 insertions(+), 11 deletions(-) (limited to 'build.symbian') diff --git a/build.symbian/bld.inf b/build.symbian/bld.inf index b516a1d9..7e269987 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 @@ libresample.mmp 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 95d37959..814fcae6 100644 --- a/build.symbian/libg7221codec.mmp +++ b/build.symbian/libg7221codec.mmp @@ -3,6 +3,7 @@ TARGETTYPE lib //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 754bceac..1b301f8c 100644 --- a/build.symbian/libgsmcodec.mmp +++ b/build.symbian/libgsmcodec.mmp @@ -19,6 +19,7 @@ TARGETTYPE lib #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 c4fb2775..3a191171 100644 --- a/build.symbian/libpassthroughcodec.mmp +++ b/build.symbian/libpassthroughcodec.mmp @@ -9,6 +9,7 @@ MACRO PJ_SYMBIAN=1 // 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 14987146..0dd074ff 100644 --- a/build.symbian/libresample.mmp +++ b/build.symbian/libresample.mmp @@ -7,6 +7,7 @@ SOURCEPATH ..\third_party\resample\src // 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 1be8a19e..816d8053 100644 --- a/build.symbian/libspeexcodec.mmp +++ b/build.symbian/libspeexcodec.mmp @@ -9,6 +9,7 @@ MACRO PJ_SYMBIAN=1 // 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 11384d22..4309e6dc 100644 --- a/build.symbian/libsrtp.mmp +++ b/build.symbian/libsrtp.mmp @@ -8,6 +8,7 @@ MACRO PJ_SYMBIAN=1 // 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 ea935bb2..de1dcbdc 100644 --- a/build.symbian/null_audio.mmp +++ b/build.symbian/null_audio.mmp @@ -22,6 +22,7 @@ TARGETTYPE lib 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 14576e33..65ffcc5a 100644 --- a/build.symbian/pjlib.mmp +++ b/build.symbian/pjlib.mmp @@ -24,7 +24,7 @@ MACRO PJ_SYMBIAN=1 // 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 462b1182..e48a332c 100644 --- a/build.symbian/pjlib_test.mmp +++ b/build.symbian/pjlib_test.mmp @@ -10,7 +10,7 @@ MACRO PJ_SYMBIAN=1 // 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 5dac2f8f..3eb3701a 100644 --- a/build.symbian/pjlib_util.mmp +++ b/build.symbian/pjlib_util.mmp @@ -24,7 +24,7 @@ MACRO PJ_SYMBIAN=1 // 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 7dd9fc79..b7293434 100644 --- a/build.symbian/pjmedia.mmp +++ b/build.symbian/pjmedia.mmp @@ -30,7 +30,7 @@ MACRO PJ_SYMBIAN=1 // 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 da98b05e..f4e25d21 100644 --- a/build.symbian/pjmedia_audiodev.mmp +++ b/build.symbian/pjmedia_audiodev.mmp @@ -7,6 +7,7 @@ SOURCEPATH ..\pjmedia\src\pjmedia-audiodev // 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 7168313d..76b64dda 100644 --- a/build.symbian/pjnath.mmp +++ b/build.symbian/pjnath.mmp @@ -17,6 +17,8 @@ TARGETTYPE lib #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 25f3db19..e165704e 100644 --- a/build.symbian/pjsdp.mmp +++ b/build.symbian/pjsdp.mmp @@ -24,7 +24,7 @@ MACRO PJ_SYMBIAN=1 // 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 b74f4de6..6269b47d 100644 --- a/build.symbian/pjsip.mmp +++ b/build.symbian/pjsip.mmp @@ -27,7 +27,7 @@ MACRO PJ_SYMBIAN=1 // 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 b0d85dc6..9b83a9df 100644 --- a/build.symbian/pjsip_simple.mmp +++ b/build.symbian/pjsip_simple.mmp @@ -27,7 +27,7 @@ MACRO PJ_SYMBIAN=1 // 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 59293049..609c0a39 100644 --- a/build.symbian/pjsip_ua.mmp +++ b/build.symbian/pjsip_ua.mmp @@ -27,7 +27,7 @@ MACRO PJ_SYMBIAN=1 // 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 fedb7a25..6ca5eabc 100644 --- a/build.symbian/pjstun_client.mmp +++ b/build.symbian/pjstun_client.mmp @@ -2,6 +2,8 @@ TARGET pjstun_client.exe 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 0b197819..ee7c6b08 100644 --- a/build.symbian/pjsua_lib.mmp +++ b/build.symbian/pjsua_lib.mmp @@ -27,7 +27,7 @@ MACRO PJ_SYMBIAN=1 // 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 e53f4e89..bba9ce5f 100644 --- a/build.symbian/symbian_audio.mmp +++ b/build.symbian/symbian_audio.mmp @@ -25,6 +25,7 @@ SOURCEPATH ..\pjmedia\src\pjmedia 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 60310aec..9514cde3 100644 --- a/build.symbian/symbian_ua.mmp +++ b/build.symbian/symbian_ua.mmp @@ -9,6 +9,8 @@ UID 0x0 0xA000000D 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 415807df..c729e1c5 100644 --- a/build.symbian/symsndtest.mmp +++ b/build.symbian/symsndtest.mmp @@ -5,6 +5,8 @@ TARGET symsndtest.exe TARGETTYPE exe UID 0x0 0xA000000E +OPTION ARMCC --gnu + SOURCEPATH ..\pjsip-apps\src\symsndtest MACRO PJ_M_I386=1 -- cgit v1.2.3