Context Navigation

← Previous Change
Next Change →

Changeset 3046 for pjproject/trunk

Timestamp:

Jan 6, 2010 8:34:41 AM (15 years ago)

Author:

bennylp

Message:

Ticket #992: Symbian build issues using RVCT compiler (thanks Gabor Tanka for the fix)

Location:

pjproject/trunk

Files:

: 24 edited

build.symbian/bld.inf (modified) (2 diffs)
build.symbian/libg7221codec.mmp (modified) (1 diff)
build.symbian/libgsmcodec.mmp (modified) (1 diff)
build.symbian/libpassthroughcodec.mmp (modified) (1 diff)
build.symbian/libresample.mmp (modified) (1 diff)
build.symbian/libspeexcodec.mmp (modified) (1 diff)
build.symbian/libsrtp.mmp (modified) (1 diff)
build.symbian/null_audio.mmp (modified) (1 diff)
build.symbian/pjlib.mmp (modified) (1 diff)
build.symbian/pjlib_test.mmp (modified) (1 diff)
build.symbian/pjlib_util.mmp (modified) (1 diff)
build.symbian/pjmedia.mmp (modified) (1 diff)
build.symbian/pjmedia_audiodev.mmp (modified) (1 diff)
build.symbian/pjnath.mmp (modified) (1 diff)
build.symbian/pjsdp.mmp (modified) (1 diff)
build.symbian/pjsip.mmp (modified) (1 diff)
build.symbian/pjsip_simple.mmp (modified) (1 diff)
build.symbian/pjsip_ua.mmp (modified) (1 diff)
build.symbian/pjstun_client.mmp (modified) (1 diff)
build.symbian/pjsua_lib.mmp (modified) (1 diff)
build.symbian/symbian_audio.mmp (modified) (1 diff)
build.symbian/symbian_ua.mmp (modified) (1 diff)
build.symbian/symsndtest.mmp (modified) (1 diff)
pjlib/include/pj/compat/cc_armcc.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

pjproject/trunk/build.symbian/bld.inf

-                      r2768
+                      r3046
 prj_platforms
 winscw
 //armv5
+armv5
 gcce
 …
 /* Applications */
-//pjlib_test.mmp
 //symsndtest.mmp
 symbian_ua.mmp

pjproject/trunk/build.symbian/libg7221codec.mmp

r2671	r3046
4	4	//OPTION CW -lang c++
5	5	OPTION GCCE -O2 -fno-unit-at-a-time
	6	OPTION ARMCC --gnu
6	7
7	8	MACRO PJ_M_I386=1

pjproject/trunk/build.symbian/libgsmcodec.mmp

r1793	r3046
20	20
21	21	//OPTION CW -lang c++
	22	OPTION ARMCC --gnu
22	23
23	24	MACRO PJ_M_I386=1

pjproject/trunk/build.symbian/libpassthroughcodec.mmp

r2506	r3046
10	10	//
11	11	OPTION GCCE -O2 -fno-unit-at-a-time
	12	OPTION ARMCC --gnu
12	13
13	14	//

pjproject/trunk/build.symbian/libresample.mmp

r2676	r3046
8	8	//
9	9	OPTION GCCE -O2 -fno-unit-at-a-time
	10	OPTION ARMCC --gnu
10	11
11	12	MACRO PJ_M_I386=1

pjproject/trunk/build.symbian/libspeexcodec.mmp

r2002	r3046
10	10	//
11	11	OPTION GCCE -O2 -fno-unit-at-a-time
	12	OPTION ARMCC --gnu
12	13
13	14	//

pjproject/trunk/build.symbian/libsrtp.mmp

r1979	r3046
9	9	//
10	10	OPTION GCCE -O2 -fno-unit-at-a-time
	11	OPTION ARMCC --gnu
11	12
12	13	//

pjproject/trunk/build.symbian/null_audio.mmp

r1640	r3046
23	23
24	24	OPTION CW -lang c++
	25	OPTION ARMCC --gnu
25	26
26	27	MACRO PJ_M_I386=1

pjproject/trunk/build.symbian/pjlib.mmp

r2966	r3046
25	25	// Must compile as C++, otherwise exception would not work
26	26	OPTION CW -lang c++
27		OPTION ARMCC --cpp
	27	OPTION ARMCC --cpp --gnu
28	28	OPTION GCC -x c++
29	29	OPTION GCCE -x c++

pjproject/trunk/build.symbian/pjlib_test.mmp

r2990	r3046
11	11	// Must compile as C++, otherwise exception would not work
12	12	OPTION CW -lang c++
13		OPTION ARMCC --cpp
	13	OPTION ARMCC --cpp --gnu
14	14	OPTION GCC -x c++
15	15	OPTION GCCE -x c++

pjproject/trunk/build.symbian/pjlib_util.mmp

r2873	r3046
25	25	// Must compile as C++, otherwise exception would not work
26	26	OPTION CW -lang c++
27		OPTION ARMCC --cpp
	27	OPTION ARMCC --cpp --gnu
28	28	OPTION GCC -x c++
29	29	OPTION GCCE -x c++

pjproject/trunk/build.symbian/pjmedia.mmp

r2768	r3046
31	31	// Must compile as C++, otherwise exception would not work
32	32	OPTION CW -lang c++
33		OPTION ARMCC --cpp
	33	OPTION ARMCC --cpp --gnu
34	34	OPTION GCC -x c++
35	35	OPTION GCCE -x c++

pjproject/trunk/build.symbian/pjmedia_audiodev.mmp

r2821	r3046
8	8	//
9	9	//OPTION GCCE -O2 -fno-unit-at-a-time
	10	OPTION ARMCC --gnu
10	11
11	12	MACRO PJ_M_I386=1

pjproject/trunk/build.symbian/pjnath.mmp

r2506	r3046
17	17
18	18	#endif
	19
	20	OPTION ARMCC --gnu
19	21
20	22	SOURCEPATH ..\pjnath\src\pjnath

pjproject/trunk/build.symbian/pjsdp.mmp

r2873	r3046
25	25	// Must compile as C++, otherwise exception would not work
26	26	OPTION CW -lang c++
27		OPTION ARMCC --cpp
	27	OPTION ARMCC --cpp --gnu
28	28	OPTION GCC -x c++
29	29	OPTION GCCE -x c++

pjproject/trunk/build.symbian/pjsip.mmp

r2913	r3046
28	28	// Must compile as C++, otherwise exception would not work
29	29	OPTION CW -lang c++
30		OPTION ARMCC --cpp
	30	OPTION ARMCC --cpp --gnu
31	31	OPTION GCC -x c++
32	32	OPTION GCCE -x c++

pjproject/trunk/build.symbian/pjsip_simple.mmp

r2968	r3046
28	28	// Must compile as C++, otherwise exception would not work
29	29	OPTION CW -lang c++
30		OPTION ARMCC --cpp
	30	OPTION ARMCC --cpp --gnu
31	31	OPTION GCC -x c++
32	32	OPTION GCCE -x c++

pjproject/trunk/build.symbian/pjsip_ua.mmp

r2861	r3046
28	28	// Must compile as C++, otherwise exception would not work
29	29	OPTION CW -lang c++
30		OPTION ARMCC --cpp
	30	OPTION ARMCC --cpp --gnu
31	31	OPTION GCC -x c++
32	32	OPTION GCCE -x c++

pjproject/trunk/build.symbian/pjstun_client.mmp

r2506	r3046
2	2	TARGETTYPE exe
3	3	UID 0x0 0xA000000A
	4
	5	OPTION ARMCC --gnu
4	6
5	7	SOURCEPATH ..\pjnath\src\pjstun-client

pjproject/trunk/build.symbian/pjsua_lib.mmp

r2768	r3046
28	28	// Must compile as C++, otherwise exception would not work
29	29	OPTION CW -lang c++
30		OPTION ARMCC --cpp
	30	OPTION ARMCC --cpp --gnu
31	31	OPTION GCC -x c++
32	32	OPTION GCCE -x c++

pjproject/trunk/build.symbian/symbian_audio.mmp

r2506	r3046
26	26	OPTION CW -lang c++
27	27	OPTION GCCE -O2 -fno-unit-at-a-time
	28	OPTION ARMCC --gnu
28	29
29	30	MACRO PJ_M_I386=1

pjproject/trunk/build.symbian/symbian_ua.mmp

r2913	r3046
9	9
10	10	SOURCEPATH ..\pjsip-apps\src\symbian_ua
	11
	12	OPTION ARMCC --gnu
11	13
12	14	MACRO PJ_M_I386=1

pjproject/trunk/build.symbian/symsndtest.mmp

r2821	r3046
5	5	TARGETTYPE exe
6	6	UID 0x0 0xA000000E
	7
	8	OPTION ARMCC --gnu
7	9
8	10	SOURCEPATH ..\pjsip-apps\src\symsndtest

pjproject/trunk/pjlib/include/pj/compat/cc_armcc.h

-                      r2407
+                      r3046
 #define PJ_CC_NAME              "armcc"
 #define PJ_CC_VER_1             __ARMCC__
 #define PJ_CC_VER_2             __ARMCC_MINOR__
 #define PJ_CC_VER_3             __ARMCC_PATCHLEVEL__
+#define PJ_CC_VER_1             (__ARMCC_VERSION/100000)
+#define PJ_CC_VER_2             ((__ARMCC_VERSION%100000)/10000)
+#define PJ_CC_VER_3             (__ARMCC_VERSION%10000)
 #ifdef __cplusplus

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 3046 for pjproject/trunk

Legend:

Download in other formats: