diff options
author | Benny Prijono <bennylp@teluu.com> | 2007-05-12 15:03:23 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2007-05-12 15:03:23 +0000 |
commit | fd5aade84080ce74df1622958ea2c56c3e827703 (patch) | |
tree | ba9d237790fd514955f4e716afc162b7d7091d31 /build.symbian | |
parent | 3727cae28c3f725ff6f909955718523737a597fa (diff) |
Symbian fixes to compile on GCCE (nested callbacks etc)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1269 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'build.symbian')
-rw-r--r-- | build.symbian/bld.inf | 5 | ||||
-rw-r--r-- | build.symbian/pjlib.mmp | 60 | ||||
-rw-r--r-- | build.symbian/pjlib_test.mmp | 2 | ||||
-rw-r--r-- | build.symbian/pjlib_util.mmp | 2 | ||||
-rw-r--r-- | build.symbian/pjmedia.mmp | 160 | ||||
-rw-r--r-- | build.symbian/pjnath.mmp | 8 | ||||
-rw-r--r-- | build.symbian/pjsdp.mmp | 2 | ||||
-rw-r--r-- | build.symbian/pjsip.mmp | 2 | ||||
-rw-r--r-- | build.symbian/pjsip_simple.mmp | 2 | ||||
-rw-r--r-- | build.symbian/pjsip_ua.mmp | 2 | ||||
-rw-r--r-- | build.symbian/pjstun_client.mmp | 2 |
11 files changed, 134 insertions, 113 deletions
diff --git a/build.symbian/bld.inf b/build.symbian/bld.inf index 5ded5aec..9e51ee9a 100644 --- a/build.symbian/bld.inf +++ b/build.symbian/bld.inf @@ -1,3 +1,8 @@ +prj_platforms +winscw +armv5 +gcce + prj_mmpfiles pjlib.mmp pjlib_util.mmp diff --git a/build.symbian/pjlib.mmp b/build.symbian/pjlib.mmp index 8ec56ca7..e574b47a 100644 --- a/build.symbian/pjlib.mmp +++ b/build.symbian/pjlib.mmp @@ -6,6 +6,8 @@ VENDORID 0x70000001 SOURCEPATH ..\pjlib\src\pj OPTION CW -lang c++ +OPTION ARMCC --cpp +OPTION GCC -x c++ MACRO PJ_M_I386=1 MACRO PJ_SYMBIAN=1 @@ -56,37 +58,37 @@ SOURCE sock_select_symbian.cpp SOURCE timer_symbian.cpp SOURCE unicode_symbian.cpp -DOCUMENT os_symbian.h +//DOCUMENT os_symbian.h -DOCUMENT pj\addr_resolv.h -DOCUMENT pj\array.h -DOCUMENT pj\assert.h -DOCUMENT pj\config.h -DOCUMENT pj\config_site.h +//DOCUMENT pj\addr_resolv.h +//DOCUMENT pj\array.h +//DOCUMENT pj\assert.h +//DOCUMENT pj\config.h +//DOCUMENT pj\config_site.h //DOCUMENT pj\config_site_sample.h -DOCUMENT pj\ctype.h -DOCUMENT pj\errno.h -DOCUMENT pj\except.h -DOCUMENT pj\file_access.h -DOCUMENT pj\file_io.h -DOCUMENT pj\guid.h -DOCUMENT pj\hash.h -DOCUMENT pj\ioqueue.h -DOCUMENT pj\ip_helper.h -DOCUMENT pj\list.h -DOCUMENT pj\lock.h -DOCUMENT pj\log.h -DOCUMENT pj\os.h -DOCUMENT pj\\pool.h -DOCUMENT pj\\pool_buf.h -DOCUMENT pj\rand.h -DOCUMENT pj\rbtree.h -DOCUMENT pj\sock.h -DOCUMENT pj\sock_select.h -DOCUMENT pj\string.h -DOCUMENT pj\timer.h -DOCUMENT pj\types.h -DOCUMENT pj\unicode.h +//DOCUMENT pj\ctype.h +//DOCUMENT pj\errno.h +//DOCUMENT pj\except.h +//DOCUMENT pj\file_access.h +//DOCUMENT pj\file_io.h +//DOCUMENT pj\guid.h +//DOCUMENT pj\hash.h +//DOCUMENT pj\ioqueue.h +//DOCUMENT pj\ip_helper.h +//DOCUMENT pj\list.h +//DOCUMENT pj\lock.h +//DOCUMENT pj\log.h +//DOCUMENT pj\os.h +//DOCUMENT pj\\pool.h +//DOCUMENT pj\\pool_buf.h +//DOCUMENT pj\rand.h +//DOCUMENT pj\rbtree.h +//DOCUMENT pj\sock.h +//DOCUMENT pj\sock_select.h +//DOCUMENT pj\string.h +//DOCUMENT pj\timer.h +//DOCUMENT pj\types.h +//DOCUMENT pj\unicode.h SYSTEMINCLUDE ..\pjlib\include diff --git a/build.symbian/pjlib_test.mmp b/build.symbian/pjlib_test.mmp index 9836a14e..ed88906e 100644 --- a/build.symbian/pjlib_test.mmp +++ b/build.symbian/pjlib_test.mmp @@ -9,6 +9,8 @@ MACRO PJ_M_I386=1 MACRO PJ_SYMBIAN=1 OPTION CW -lang c++ +OPTION ARMCC --cpp +OPTION GCC -x c++ // Test files diff --git a/build.symbian/pjlib_util.mmp b/build.symbian/pjlib_util.mmp index 30f59fa2..fc161cae 100644 --- a/build.symbian/pjlib_util.mmp +++ b/build.symbian/pjlib_util.mmp @@ -9,6 +9,8 @@ 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.mmp b/build.symbian/pjmedia.mmp index 7af3187b..4534a45e 100644 --- a/build.symbian/pjmedia.mmp +++ b/build.symbian/pjmedia.mmp @@ -1,80 +1,80 @@ -TARGET pjmedia.lib
-TARGETTYPE lib
-UID 0x100039CE 0x10004299
-VENDORID 0x70000001
-
-SOURCEPATH ..\pjmedia\src\pjmedia
-
-//OPTION CW -lang c++
-
-MACRO PJ_M_I386=1
-MACRO PJ_SYMBIAN=1
-
-//
-// Platform independent source
-//
-
-SOURCE alaw_ulaw.c
-SOURCE alaw_ulaw_table.c
-SOURCE bidirectional.c
-SOURCE clock_thread.c
-SOURCE codec.c
-SOURCE conference.c
-SOURCE echo_common.c
-SOURCE echo_port.c
-SOURCE echo_suppress.c
-SOURCE endpoint.c
-SOURCE errno.c
-SOURCE g711.c
-SOURCE jbuf.c
-SOURCE master_port.c
-SOURCE mem_capture.c
-SOURCE mem_player.c
-SOURCE null_port.c
-SOURCE plc_common.c
-SOURCE port.c
-SOURCE resample_port.c
-SOURCE resample_resample.c
-SOURCE rtcp.c
-SOURCE rtp.c
-//SDP files are in pjsdp.mmp
-//SOURCE sdp.c
-//SOURCE sdp_cmp.c
-//SOURCE sdp_neg.c
-SOURCE session.c
-SOURCE silencedet.c
-SOURCE sound_port.c
-SOURCE splitcomb.c
-SOURCE stream.c
-SOURCE tonegen.c
-SOURCE transport_ice.c
-SOURCE transport_udp.c
-SOURCE wav_player.c
-SOURCE wav_playlist.c
-SOURCE wav_writer.c
-SOURCE wave.c
-
-//
-// Symbian specific
-// These are on separate project
-//
-//SOURCE symbian_sound.cpp
-//SOURCE null_sound.c
-
-
-//
-// Header files
-//
-
-
-SYSTEMINCLUDE ..\pjmedia\include
-SYSTEMINCLUDE ..\pjlib\include
-SYSTEMINCLUDE ..\pjlib-util\include
-SYSTEMINCLUDE ..\pjnath\include
-
-SYSTEMINCLUDE \epoc32\include
-SYSTEMINCLUDE \epoc32\include\libc
-SYSTEMINCLUDE \epoc32\include\mmf\plugin
-
-CAPABILITY None
-
+TARGET pjmedia.lib +TARGETTYPE lib +UID 0x100039CE 0x10004299 +VENDORID 0x70000001 + +SOURCEPATH ..\pjmedia\src\pjmedia + +//OPTION CW -lang c++ + +MACRO PJ_M_I386=1 +MACRO PJ_SYMBIAN=1 + +// +// Platform independent source +// + +SOURCE alaw_ulaw.c +SOURCE alaw_ulaw_table.c +SOURCE bidirectional.c +SOURCE clock_thread.c +SOURCE codec.c +SOURCE conference.c +SOURCE echo_common.c +SOURCE echo_port.c +SOURCE echo_suppress.c +SOURCE endpoint.c +SOURCE errno.c +SOURCE g711.c +SOURCE jbuf.c +SOURCE master_port.c +SOURCE mem_capture.c +SOURCE mem_player.c +SOURCE null_port.c +SOURCE plc_common.c +SOURCE port.c +SOURCE resample_port.c +SOURCE resample_resample.c +SOURCE rtcp.c +SOURCE rtp.c +//SDP files are in pjsdp.mmp +//SOURCE sdp.c +//SOURCE sdp_cmp.c +//SOURCE sdp_neg.c +SOURCE session.c +SOURCE silencedet.c +SOURCE sound_port.c +SOURCE splitcomb.c +SOURCE stream.c +SOURCE tonegen.c +SOURCE transport_ice.c +SOURCE transport_udp.c +SOURCE wav_player.c +SOURCE wav_playlist.c +SOURCE wav_writer.c +SOURCE wave.c + +// +// Symbian specific +// These are on separate project +// +//SOURCE symbian_sound.cpp +//SOURCE null_sound.c + + +// +// Header files +// + + +SYSTEMINCLUDE ..\pjmedia\include +SYSTEMINCLUDE ..\pjlib\include +SYSTEMINCLUDE ..\pjlib-util\include +SYSTEMINCLUDE ..\pjnath\include + +SYSTEMINCLUDE \epoc32\include +SYSTEMINCLUDE \epoc32\include\libc +//SYSTEMINCLUDE \epoc32\include\mmf\plugin + +CAPABILITY None + diff --git a/build.symbian/pjnath.mmp b/build.symbian/pjnath.mmp index 8e648dd6..2bd86911 100644 --- a/build.symbian/pjnath.mmp +++ b/build.symbian/pjnath.mmp @@ -8,7 +8,9 @@ SOURCEPATH ..\pjnath\src\pjnath MACRO PJ_M_I386=1 MACRO PJ_SYMBIAN=1 -//OPTION CW -lang c++ +OPTION CW -lang c++ +OPTION ARMCC --cpp +OPTION GCC -x c++ // // PJNATH files @@ -45,7 +47,7 @@ SYSTEMINCLUDE ..\pjnath\include SYSTEMINCLUDE \epoc32\include SYSTEMINCLUDE \epoc32\include\libc -LIBRARY pjlib.lib -LIBRARY pjlib_util.lib +//STATICLIBRARY pjlib.lib +//STATICLIBRARY pjlib_util.lib CAPABILITY None diff --git a/build.symbian/pjsdp.mmp b/build.symbian/pjsdp.mmp index 97f461bf..3ff46f1a 100644 --- a/build.symbian/pjsdp.mmp +++ b/build.symbian/pjsdp.mmp @@ -6,6 +6,8 @@ VENDORID 0x70000001 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 d1dd741e..cabb74be 100644 --- a/build.symbian/pjsip.mmp +++ b/build.symbian/pjsip.mmp @@ -9,6 +9,8 @@ MACRO PJ_M_I386=1 MACRO PJ_SYMBIAN=1 OPTION CW -lang c++ +OPTION ARMCC --cpp +OPTION GCC -x c++ // PJSIP-CORE files diff --git a/build.symbian/pjsip_simple.mmp b/build.symbian/pjsip_simple.mmp index 0ff7f162..f77c5b45 100644 --- a/build.symbian/pjsip_simple.mmp +++ b/build.symbian/pjsip_simple.mmp @@ -9,6 +9,8 @@ MACRO PJ_M_I386=1 MACRO PJ_SYMBIAN=1 OPTION CW -lang c++ +OPTION ARMCC --cpp +OPTION GCC -x c++ // PJSIP-SIMPLE files diff --git a/build.symbian/pjsip_ua.mmp b/build.symbian/pjsip_ua.mmp index cef53738..08ab2452 100644 --- a/build.symbian/pjsip_ua.mmp +++ b/build.symbian/pjsip_ua.mmp @@ -11,7 +11,7 @@ MACRO PJ_SYMBIAN=1 //OPTION CW -lang c++ -// PJSIP-SIMPLE files +// PJSIP-UA files SOURCE sip_inv.c SOURCE sip_reg.c diff --git a/build.symbian/pjstun_client.mmp b/build.symbian/pjstun_client.mmp index 98194e86..2c9d3521 100644 --- a/build.symbian/pjstun_client.mmp +++ b/build.symbian/pjstun_client.mmp @@ -9,6 +9,8 @@ MACRO PJ_M_I386=1 MACRO PJ_SYMBIAN=1 OPTION CW -lang c++ +OPTION ARMCC --cpp +OPTION GCC -x c++ // PJSTUN-CLIENT files |