1 files changed, 70 insertions, 63 deletions
diff --git a/build.symbian/symbian_ua.mmp b/build.symbian/symbian_ua.mmp
index 938b84d4..a96da6ac 100644
--- a/build.symbian/symbian_ua.mmp
+++ b/build.symbian/symbian_ua.mmp
@@ -1,63 +1,70 @@
-#define SND_USE_NULL	0
-#define SND_USE_APS	0
-
-TARGET 		symbian_ua.exe
-TARGETTYPE 	exe
-UID		0x0 0xA000000D
-
-SOURCEPATH	..\pjsip-apps\src\symbian_ua
-
-MACRO		PJ_M_I386=1
-MACRO		PJ_SYMBIAN=1
-
-// Source files
-
-SOURCE	ua.cpp
-SOURCE	main_symbian.cpp
-
-DOCUMENT ua.h
-
-START RESOURCE  symbian_ua_reg.rss
-	TARGETPATH      \private\10003a3f\apps
-END
-
-SYSTEMINCLUDE	..\pjlib\include
-SYSTEMINCLUDE	..\pjlib-util\include
-SYSTEMINCLUDE	..\pjnath\include
-SYSTEMINCLUDE	..\pjmedia\include
-SYSTEMINCLUDE	..\pjsip\include
-
-SYSTEMINCLUDE	\epoc32\include
-SYSTEMINCLUDE	\epoc32\include\libc
-
-STATICLIBRARY	pjsua_lib.lib pjsip_ua.lib
-STATICLIBRARY	pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib
-STATICLIBRARY	pjnath.lib pjlib_util.lib pjlib.lib
-STATICLIBRARY	libsrtp.lib
-STATICLIBRARY	libgsmcodec.lib libspeexcodec.lib
-
-#if SND_USE_NULL
-    STATICLIBRARY	null_audio.lib
-    CAPABILITY		NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment 
-#elif SND_USE_APS
-    STATICLIBRARY	symbian_audio_aps.lib
-    LIBRARY		APSSession2.lib
-    CAPABILITY		NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD
-    MACRO		PJMEDIA_SYM_SND_USE_APS=1
-#else
-    STATICLIBRARY	symbian_audio.lib
-    LIBRARY 		mediaclientaudiostream.lib
-    LIBRARY 		mediaclientaudioinputstream.lib
-    CAPABILITY		NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment 
-#endif
-
-#ifdef WINSCW
-	STATICLIBRARY   eexe.lib ecrt0.lib
-#endif
-
-LIBRARY		esock.lib insock.lib charconv.lib euser.lib estlib.lib commdb.lib apengine.lib 
-
-// The default 8KB seems to be insufficient with all bells and
-// whistles turned on
-EPOCSTACKSIZE	12288
-
+#define SND_HAS_APS	0
+#define SND_HAS_VAS	0
+#define SND_HAS_MDA	1
+
+TARGET 			symbian_ua.exe
+TARGETTYPE 		exe
+UID			0x0 0x200235D3
+
+SOURCEPATH		..\pjsip-apps\src\symbian_ua
+
+MACRO			PJ_M_I386=1
+MACRO			PJ_SYMBIAN=1
+
+// Source files
+
+SOURCE			ua.cpp
+SOURCE			main_symbian.cpp
+
+DOCUMENT 		ua.h
+
+START RESOURCE  	symbian_ua_reg.rss
+	TARGETPATH      \private\10003a3f\apps
+END
+
+SYSTEMINCLUDE		..\pjlib\include
+SYSTEMINCLUDE		..\pjlib-util\include
+SYSTEMINCLUDE		..\pjnath\include
+SYSTEMINCLUDE		..\pjmedia\include
+SYSTEMINCLUDE		..\pjsip\include
+
+SYSTEMINCLUDE		\epoc32\include
+SYSTEMINCLUDE		\epoc32\include\libc
+
+STATICLIBRARY		pjsua_lib.lib pjsip_ua.lib
+STATICLIBRARY		pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib
+STATICLIBRARY		pjnath.lib pjlib_util.lib pjlib.lib
+STATICLIBRARY		libsrtp.lib
+STATICLIBRARY		libgsmcodec.lib libspeexcodec.lib
+STATICLIBRARY		libpassthroughcodec.lib
+STATICLIBRARY		pjmedia_audiodev.lib 
+
+#if SND_HAS_APS
+	LIBRARY		APSSession2.lib
+#endif
+
+#if SND_HAS_VAS
+//	LIBRARY		
+#endif
+
+#if SND_HAS_MDA
+	LIBRARY 	mediaclientaudiostream.lib
+	LIBRARY 	mediaclientaudioinputstream.lib
+#endif
+
+#if SND_HAS_APS || SND_HAS_VAS
+	CAPABILITY	NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD
+#else
+	CAPABILITY	NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment
+#endif
+	
+#ifdef WINSCW
+	STATICLIBRARY   eexe.lib ecrt0.lib
+#endif
+
+LIBRARY			esock.lib insock.lib charconv.lib euser.lib estlib.lib commdb.lib apengine.lib 
+
+// The default 8KB seems to be insufficient with all bells and
+// whistles turned on
+EPOCSTACKSIZE		12288
+