Updated projects and Makefiles with the new pjnath library

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1111 74dad513-b988-da41-8d7b-12977e46ad98

5 files changed, 119 insertions, 32 deletions

diff --git a/pjsip-apps/build/Makefile b/pjsip-apps/build/Makefile
index 228a4946..fe6a1355 100644
--- a/pjsip-apps/build/Makefile
+++ b/pjsip-apps/build/Makefile
@@ -4,6 +4,7 @@ RULES_MAK := ../../build/rules.mak
 
 PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT)
 PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT)
+PJNATH_LIB:=../../pjnath/lib/libpjnath-$(TARGET_NAME)$(LIBEXT)
 PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-$(TARGET_NAME)$(LIBEXT)
 PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT)
 PJSIP_LIB:=../../pjsip/lib/libpjsip-$(TARGET_NAME)$(LIBEXT)
@@ -16,8 +17,11 @@ PJSUA_LIB_LIB=../../pjsip/lib/libpjsua-$(TARGET_NAME)$(LIBEXT)
 # Gather all flags.
 #
 export _CFLAGS 	:= $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
-		   $(CFLAGS) $(CC_INC)../../pjsip/include $(CC_INC)../../pjlib/include \
-		   $(CC_INC)../../pjlib-util/include $(CC_INC)../../pjmedia/include
+		   $(CFLAGS) $(CC_INC)../../pjsip/include \
+		   $(CC_INC)../../pjlib/include \
+		   $(CC_INC)../../pjlib-util/include \
+		   $(CC_INC)../../pjnath/include \
+		   $(CC_INC)../../pjmedia/include
 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
 		   $(HOST_CXXFLAGS) $(CXXFLAGS)
 export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJSUA_LIB_LIB)) \
@@ -27,6 +31,7 @@ export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJSUA_LIB_LIB)) \
 		   $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \
 		   $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \
 		   $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \
+		   $(subst /,$(HOST_PSEP),$(PJNATH_LIB)) \
 		   $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \
 		   $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \
 		   $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
@@ -77,7 +82,7 @@ clean depend realclean:
 	$(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $@
 	$(MAKE) -f Samples.mak $@
 	@if test "$@" = "depend"; then \
-	  echo '$(PJSUA_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE) $(PJSUA_LIB_LIB) $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB) Makefile' >> .pjsua-$(TARGET_NAME).depend; \
+	  echo '$(PJSUA_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE) $(PJSUA_LIB_LIB) $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB) $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB) Makefile' >> .pjsua-$(TARGET_NAME).depend; \
 	fi
 
 
diff --git a/pjsip-apps/build/Samples-vc.mak b/pjsip-apps/build/Samples-vc.mak
index 1b830180..c4f0d6c9 100644
--- a/pjsip-apps/build/Samples-vc.mak
+++ b/pjsip-apps/build/Samples-vc.mak
@@ -25,7 +25,8 @@ LIBS = $(PJSUA_LIB_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE_LIB) \
 CFLAGS 	= /DPJ_WIN32=1 /DPJ_M_I386=1 \
 	  $(BUILD_FLAGS) \
 	  -I..\..\pjsip\include \
-	  -I..\..\pjlib\include -I..\..\pjlib-util\include \
+	  -I..\..\pjlib\include \
+	  -I..\..\pjlib-util\include \
 	  -I..\..\pjmedia\include \
 	  -I..\..\pjnath/include
 LDFLAGS = $(BUILD_FLAGS) $(LIBS) \
diff --git a/pjsip-apps/build/Samples.mak b/pjsip-apps/build/Samples.mak
index c3fe6dd6..a7eb5ad4 100644
--- a/pjsip-apps/build/Samples.mak
+++ b/pjsip-apps/build/Samples.mak
@@ -3,6 +3,7 @@ include ../../build/common.mak
 
 PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT)
 PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT)
+PJNATH_LIB:=../../pjnath/lib/libpjnath-$(TARGET_NAME)$(LIBEXT)
 PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-$(TARGET_NAME)$(LIBEXT)
 PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT)
 PJSIP_LIB:=../../pjsip/lib/libpjsip-$(TARGET_NAME)$(LIBEXT)
@@ -15,8 +16,11 @@ PJSUA_LIB_LIB=../../pjsip/lib/libpjsua-$(TARGET_NAME)$(LIBEXT)
 # Gather all flags.
 #
 export _CFLAGS 	:= $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
-		   $(CFLAGS) $(CC_INC)../../pjsip/include $(CC_INC)../../pjlib/include \
-		   $(CC_INC)../../pjlib-util/include $(CC_INC)../../pjmedia/include
+		   $(CFLAGS) $(CC_INC)../../pjsip/include \
+		   $(CC_INC)../../pjlib/include \
+		   $(CC_INC)../../pjlib-util/include \
+		   $(CC_INC)../../pjnath/include \
+		   $(CC_INC)../../pjmedia/include
 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
 		   $(HOST_CXXFLAGS) $(CXXFLAGS)
 
@@ -27,6 +31,7 @@ export LIBS :=	$(subst /,$(HOST_PSEP),$(PJSUA_LIB_LIB)) \
 		$(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \
 		$(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \
 		$(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \
+		$(subst /,$(HOST_PSEP),$(PJNATH_LIB)) \
 		$(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \
 		$(subst /,$(HOST_PSEP),$(PJLIB_LIB))
 
diff --git a/pjsip-apps/build/wince-evc4/wince_demos.vcw b/pjsip-apps/build/wince-evc4/wince_demos.vcw
index 279a3825..bc48aef4 100644
--- a/pjsip-apps/build/wince-evc4/wince_demos.vcw
+++ b/pjsip-apps/build/wince-evc4/wince_demos.vcw
@@ -51,6 +51,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "pjnath_wince"="..\..\..\pjnath\build\wince-evc4\pjnath_wince.vcp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "pjsip_core_wince"="..\..\..\pjsip\build\wince-evc4\pjsip_core_wince.vcp" - Package Owner=<4>
 
 Package=<5>
@@ -152,6 +164,9 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name pjsua_lib_wince
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name pjnath_wince
+    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp b/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp
index e4f88a02..a41d118e 100644
--- a/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp
+++ b/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp
@@ -61,7 +61,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r

 CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Yu"stdafx.h" /Gs8192 /GF /O2 /c

-# ADD CPP /nologo /W3 /I "../../include" /I "../../../pjsip/include" /I "../../../pjlib-util/include" /I "../../../pjlib/include" /I "../../../pjmedia/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Yu"stdafx.h" /Gs8192 /GF /O2 /c

+# ADD CPP /nologo /W3 /I "../../include" /I "../../../pjsip/include" /I "../../../pjlib-util/include" /I "../../../pjlib/include" /I "../../../pjmedia/include" /I "../../../pjnath/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Yu"stdafx.h" /Gs8192 /GF /O2 /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

@@ -70,7 +70,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86

-# ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib winsock.lib ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86

+# ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib winsock.lib ws2.lib iphlpapi.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86

 

 !ELSEIF  "$(CFG)" == "pjsua_wince - Win32 (WCE emulator) Debug"

 

@@ -94,7 +94,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d "$(CePlatform)" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "_X86_" /d "x86" /d "_i386_" /r

 CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Yu"stdafx.h" /Gs8192 /GF /c

-# ADD CPP /nologo /W3 /Zi /Od /I "../../../pjsip/include" /I "../../../pjlib-util/include" /I "../../../pjlib/include" /I "../../../pjmedia/include" /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /FR /Yu"stdafx.h" /Gs8192 /GF /c

+# ADD CPP /nologo /W3 /Zi /Od /I "../../../pjsip/include" /I "../../../pjlib-util/include" /I "../../../pjlib/include" /I "../../../pjmedia/include" /I "../../../pjnath/include" /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /FR /Yu"stdafx.h" /Gs8192 /GF /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

@@ -103,7 +103,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86

-# ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib winsock.lib ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86

+# ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib winsock.lib ws2.lib iphlpapi.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86

 

 !ELSEIF  "$(CFG)" == "pjsua_wince - Win32 (WCE ARMV4I) Release"

 

@@ -127,7 +127,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "THUMB" /d "_THUMB_" /d "ARM" /d "_ARM_" /d "ARMV4I" /r

 CPP=clarm.exe

 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "ARMV4I" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /QRarch4T /QRinterwork-return /O2 /M$(CECrtMT) /c

-# ADD CPP /nologo /W3 /I "../../include" /I "../../../pjsip/include" /I "../../../pjlib-util/include" /I "../../../pjlib/include" /I "../../../pjmedia/include" /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "ARMV4I" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /QRarch4T /QRinterwork-return /O2 /M$(CECrtMT) /c

+# ADD CPP /nologo /W3 /I "../../include" /I "../../../pjsip/include" /I "../../../pjlib-util/include" /I "../../../pjlib/include" /I "../../../pjmedia/include" /I "../../../pjnath/include" /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "ARMV4I" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /QRarch4T /QRinterwork-return /O2 /M$(CECrtMT) /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

@@ -136,7 +136,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:THUMB

-# ADD LINK32 commctrl.lib coredll.lib winsock.lib ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:THUMB

+# ADD LINK32 commctrl.lib coredll.lib winsock.lib ws2.lib iphlpapi.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:THUMB

 

 !ELSEIF  "$(CFG)" == "pjsua_wince - Win32 (WCE ARMV4I) Debug"

 

@@ -160,7 +160,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "THUMB" /d "_THUMB_" /d "ARM" /d "_ARM_" /d "ARMV4I" /r

 CPP=clarm.exe

 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4I" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /QRarch4T /QRinterwork-return /M$(CECrtMTDebug) /c

-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../../pjsip/include" /I "../../../pjlib-util/include" /I "../../../pjlib/include" /I "../../../pjmedia/include" /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4I" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /QRarch4T /QRinterwork-return /M$(CECrtMTDebug) /c

+# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../../pjsip/include" /I "../../../pjlib-util/include" /I "../../../pjlib/include" /I "../../../pjmedia/include" /I "../../../pjnath/include" /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4I" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /QRarch4T /QRinterwork-return /M$(CECrtMTDebug) /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

@@ -169,7 +169,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:THUMB

-# ADD LINK32 commctrl.lib coredll.lib winsock.lib ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:THUMB

+# ADD LINK32 commctrl.lib coredll.lib winsock.lib ws2.lib iphlpapi.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:THUMB

 

 !ELSEIF  "$(CFG)" == "pjsua_wince - Win32 (WCE ARMV4) Release"

 

@@ -193,7 +193,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r

 CPP=clarm.exe

 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /O2 /M$(CECrtMT) /c

-# ADD CPP /nologo /W3 /I "../../include" /I "../../../pjsip/include" /I "../../../pjlib-util/include" /I "../../../pjlib/include" /I "../../../pjmedia/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /O2 /M$(CECrtMT) /c

+# ADD CPP /nologo /W3 /I "../../include" /I "../../../pjsip/include" /I "../../../pjlib-util/include" /I "../../../pjlib/include" /I "../../../pjmedia/include" /I "../../../pjnath/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /O2 /M$(CECrtMT) /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

@@ -202,7 +202,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM

-# ADD LINK32 commctrl.lib coredll.lib winsock.lib ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM

+# ADD LINK32 commctrl.lib coredll.lib winsock.lib ws2.lib iphlpapi.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM

 

 !ELSEIF  "$(CFG)" == "pjsua_wince - Win32 (WCE ARMV4) Debug"

 

@@ -226,7 +226,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r

 CPP=clarm.exe

 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /M$(CECrtMTDebug) /c

-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../../pjsip/include" /I "../../../pjlib-util/include" /I "../../../pjlib/include" /I "../../../pjmedia/include" /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /M$(CECrtMTDebug) /c

+# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../../pjsip/include" /I "../../../pjlib-util/include" /I "../../../pjlib/include" /I "../../../pjmedia/include" /I "../../../pjnath/include" /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /M$(CECrtMTDebug) /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

@@ -235,7 +235,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM

-# ADD LINK32 commctrl.lib coredll.lib winsock.lib ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM

+# ADD LINK32 commctrl.lib coredll.lib winsock.lib ws2.lib iphlpapi.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM

 

 !ELSEIF  "$(CFG)" == "pjsua_wince - Win32 (WCE ARMV4T) Release"

 

@@ -259,7 +259,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "THUMB" /d "_THUMB_" /d "ARM" /d "_ARM_" /d "ARMV4T" /r

 CPP=clthumb.exe

 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /QRarch4T /QRinterwork-return /O2 /M$(CECrtMT) /c

-# ADD CPP /nologo /W3 /I "../../include" /I "../../../pjsip/include" /I "../../../pjlib-util/include" /I "../../../pjlib/include" /I "../../../pjmedia/include" /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /QRarch4T /QRinterwork-return /O2 /M$(CECrtMT) /c

+# ADD CPP /nologo /W3 /I "../../include" /I "../../../pjsip/include" /I "../../../pjlib-util/include" /I "../../../pjlib/include" /I "../../../pjmedia/include" /I "../../../pjnath/include" /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /QRarch4T /QRinterwork-return /O2 /M$(CECrtMT) /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

@@ -268,7 +268,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:THUMB

-# ADD LINK32 commctrl.lib coredll.lib winsock.lib ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:THUMB

+# ADD LINK32 commctrl.lib coredll.lib winsock.lib ws2.lib iphlpapi.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:THUMB

 

 !ELSEIF  "$(CFG)" == "pjsua_wince - Win32 (WCE ARMV4T) Debug"

 

@@ -292,7 +292,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "THUMB" /d "_THUMB_" /d "ARM" /d "_ARM_" /d "ARMV4T" /r

 CPP=clthumb.exe

 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /QRarch4T /QRinterwork-return /M$(CECrtMTDebug) /c

-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../../pjsip/include" /I "../../../pjlib-util/include" /I "../../../pjlib/include" /I "../../../pjmedia/include" /D "DEBUG" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /QRarch4T /QRinterwork-return /M$(CECrtMTDebug) /c

+# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../../pjsip/include" /I "../../../pjlib-util/include" /I "../../../pjlib/include" /I "../../../pjmedia/include" /I "../../../pjnath/include" /D "DEBUG" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "ARM" /D "_ARM_" /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /QRarch4T /QRinterwork-return /M$(CECrtMTDebug) /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

@@ -301,7 +301,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:THUMB

-# ADD LINK32 commctrl.lib coredll.lib winsock.lib ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:THUMB

+# ADD LINK32 commctrl.lib coredll.lib winsock.lib ws2.lib iphlpapi.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:THUMB

 

 !ELSEIF  "$(CFG)" == "pjsua_wince - Win32 (WCE x86) Release"

 

@@ -325,7 +325,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r

 CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Yu"stdafx.h" /Gs8192 /GF /O2 /c

-# ADD CPP /nologo /W3 /I "../../include" /I "../../../pjsip/include" /I "../../../pjlib-util/include" /I "../../../pjlib/include" /I "../../../pjmedia/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Yu"stdafx.h" /Gs8192 /GF /O2 /c

+# ADD CPP /nologo /W3 /I "../../include" /I "../../../pjsip/include" /I "../../../pjlib-util/include" /I "../../../pjlib/include" /I "../../../pjmedia/include" /I "../../../pjnath/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Yu"stdafx.h" /Gs8192 /GF /O2 /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

@@ -334,7 +334,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86

-# ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib winsock.lib ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86

+# ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib winsock.lib ws2.lib iphlpapi.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86

 

 !ELSEIF  "$(CFG)" == "pjsua_wince - Win32 (WCE x86) Debug"

 

@@ -358,7 +358,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d "$(CePlatform)" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "_X86_" /d "x86" /d "_i386_" /r

 CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Yu"stdafx.h" /Gs8192 /GF /c

-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../../pjsip/include" /I "../../../pjlib-util/include" /I "../../../pjlib/include" /I "../../../pjmedia/include" /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Yu"stdafx.h" /Gs8192 /GF /c

+# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../../pjsip/include" /I "../../../pjlib-util/include" /I "../../../pjlib/include" /I "../../../pjmedia/include" /I "../../../pjnath/include" /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Yu"stdafx.h" /Gs8192 /GF /c

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

@@ -367,7 +367,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86

-# ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib winsock.lib ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86

+# ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib winsock.lib ws2.lib iphlpapi.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86

 

 !ENDIF 

 

@@ -401,12 +401,22 @@ DEP_CPP_PJSUA=\
 

 DEP_CPP_PJSUA=\

 	"..\..\..\pjlib-util\include\pjlib-util.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\crc32.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\dns.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\errno.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\getopt.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\hmac_md5.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\hmac_sha1.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\md5.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\resolver.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\sha1.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\srv_resolver.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\stun_simple.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\xml.h"\

 	"..\..\..\pjlib\include\pj\addr_resolv.h"\

 	"..\..\..\pjlib\include\pj\array.h"\

@@ -417,6 +427,8 @@ DEP_CPP_PJSUA=\
 	"..\..\..\pjlib\include\pj\compat\ctype.h"\

 	"..\..\..\pjlib\include\pj\compat\errno.h"\

 	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

 	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

@@ -430,6 +442,7 @@ DEP_CPP_PJSUA=\
 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

 	"..\..\..\pjlib\include\pj\ctype.h"\

 	"..\..\..\pjlib\include\pj\errno.h"\

 	"..\..\..\pjlib\include\pj\except.h"\

@@ -439,6 +452,7 @@ DEP_CPP_PJSUA=\
 	"..\..\..\pjlib\include\pj\guid.h"\

 	"..\..\..\pjlib\include\pj\hash.h"\

 	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

 	"..\..\..\pjlib\include\pj\lock.h"\

@@ -446,6 +460,7 @@ DEP_CPP_PJSUA=\
 	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

 	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

 	"..\..\..\pjlib\include\pj\rand.h"\

 	"..\..\..\pjlib\include\pj\rbtree.h"\

@@ -459,22 +474,29 @@ DEP_CPP_PJSUA=\
 	"..\..\..\pjlib\include\pjlib.h"\

 	"..\..\..\pjmedia\include\pjmedia-codec.h"\

 	"..\..\..\pjmedia\include\pjmedia-codec\config.h"\

+	"..\..\..\pjmedia\include\pjmedia-codec\config_auto.h"\

 	"..\..\..\pjmedia\include\pjmedia-codec\gsm.h"\

 	"..\..\..\pjmedia\include\pjmedia-codec\ilbc.h"\

 	"..\..\..\pjmedia\include\pjmedia-codec\l16.h"\

 	"..\..\..\pjmedia\include\pjmedia-codec\speex.h"\

 	"..\..\..\pjmedia\include\pjmedia-codec\types.h"\

 	"..\..\..\pjmedia\include\pjmedia.h"\

+	"..\..\..\pjmedia\include\pjmedia\alaw_ulaw.h"\

+	"..\..\..\pjmedia\include\pjmedia\bidirectional.h"\

 	"..\..\..\pjmedia\include\pjmedia\clock.h"\

 	"..\..\..\pjmedia\include\pjmedia\codec.h"\

 	"..\..\..\pjmedia\include\pjmedia\conference.h"\

 	"..\..\..\pjmedia\include\pjmedia\config.h"\

+	"..\..\..\pjmedia\include\pjmedia\config_auto.h"\

+	"..\..\..\pjmedia\include\pjmedia\echo.h"\

+	"..\..\..\pjmedia\include\pjmedia\echo_port.h"\

 	"..\..\..\pjmedia\include\pjmedia\endpoint.h"\

 	"..\..\..\pjmedia\include\pjmedia\errno.h"\

 	"..\..\..\pjmedia\include\pjmedia\g711.h"\

 	"..\..\..\pjmedia\include\pjmedia\jbuf.h"\

 	"..\..\..\pjmedia\include\pjmedia\master_port.h"\

 	"..\..\..\pjmedia\include\pjmedia\mem_port.h"\

+	"..\..\..\pjmedia\include\pjmedia\mp3_port.h"\

 	"..\..\..\pjmedia\include\pjmedia\null_port.h"\

 	"..\..\..\pjmedia\include\pjmedia\plc.h"\

 	"..\..\..\pjmedia\include\pjmedia\port.h"\

@@ -489,23 +511,29 @@ DEP_CPP_PJSUA=\
 	"..\..\..\pjmedia\include\pjmedia\sound_port.h"\

 	"..\..\..\pjmedia\include\pjmedia\splitcomb.h"\

 	"..\..\..\pjmedia\include\pjmedia\stream.h"\

+	"..\..\..\pjmedia\include\pjmedia\tonegen.h"\

 	"..\..\..\pjmedia\include\pjmedia\transport.h"\

+	"..\..\..\pjmedia\include\pjmedia\transport_ice.h"\

 	"..\..\..\pjmedia\include\pjmedia\transport_udp.h"\

 	"..\..\..\pjmedia\include\pjmedia\types.h"\

+	"..\..\..\pjmedia\include\pjmedia\wav_playlist.h"\

 	"..\..\..\pjmedia\include\pjmedia\wav_port.h"\

 	"..\..\..\pjmedia\include\pjmedia\wave.h"\

 	"..\..\..\pjsip\include\pjsip-simple\evsub.h"\

 	"..\..\..\pjsip\include\pjsip-simple\iscomposing.h"\

 	"..\..\..\pjsip\include\pjsip-simple\pidf.h"\

 	"..\..\..\pjsip\include\pjsip-simple\presence.h"\

+	"..\..\..\pjsip\include\pjsip-simple\publish.h"\

 	"..\..\..\pjsip\include\pjsip-simple\types.h"\

 	"..\..\..\pjsip\include\pjsip-simple\xpidf.h"\

 	"..\..\..\pjsip\include\pjsip-ua\sip_inv.h"\

 	"..\..\..\pjsip\include\pjsip-ua\sip_regc.h"\

+	"..\..\..\pjsip\include\pjsip-ua\sip_replaces.h"\

 	"..\..\..\pjsip\include\pjsip-ua\sip_xfer.h"\

 	"..\..\..\pjsip\include\pjsip.h"\

 	"..\..\..\pjsip\include\pjsip\sip_auth.h"\

 	"..\..\..\pjsip\include\pjsip\sip_auth_msg.h"\

+	"..\..\..\pjsip\include\pjsip\sip_autoconf.h"\

 	"..\..\..\pjsip\include\pjsip\sip_config.h"\

 	"..\..\..\pjsip\include\pjsip\sip_dialog.h"\

 	"..\..\..\pjsip\include\pjsip\sip_endpoint.h"\

@@ -520,6 +548,7 @@ DEP_CPP_PJSUA=\
 	"..\..\..\pjsip\include\pjsip\sip_transport.h"\

 	"..\..\..\pjsip\include\pjsip\sip_transport_loop.h"\

 	"..\..\..\pjsip\include\pjsip\sip_transport_tcp.h"\

+	"..\..\..\pjsip\include\pjsip\sip_transport_tls.h"\

 	"..\..\..\pjsip\include\pjsip\sip_transport_udp.h"\

 	"..\..\..\pjsip\include\pjsip\sip_types.h"\

 	"..\..\..\pjsip\include\pjsip\sip_ua_layer.h"\

@@ -531,9 +560,6 @@ DEP_CPP_PJSUA=\
 	".\pjsua_wince.h"\

 	".\StdAfx.h"\

 	

-NODEP_CPP_PJSUA=\

-	"..\..\..\pjlib-util\include\pjlib-util\stun.h"\

-	

 

 !ELSEIF  "$(CFG)" == "pjsua_wince - Win32 (WCE ARMV4I) Release"

 

@@ -691,12 +717,22 @@ NODEP_CPP_PJSUA=\
 

 DEP_CPP_PJSUA=\

 	"..\..\..\pjlib-util\include\pjlib-util.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\config.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\crc32.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\dns.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\errno.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\getopt.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\hmac_md5.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\hmac_sha1.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\md5.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\resolver.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_bitwise.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\scanner_cis_uint.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\sha1.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\srv_resolver.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\stun_simple.h"\

+	"..\..\..\pjlib-util\include\pjlib-util\types.h"\

 	"..\..\..\pjlib-util\include\pjlib-util\xml.h"\

 	"..\..\..\pjlib\include\pj\addr_resolv.h"\

 	"..\..\..\pjlib\include\pj\array.h"\

@@ -707,6 +743,8 @@ DEP_CPP_PJSUA=\
 	"..\..\..\pjlib\include\pj\compat\ctype.h"\

 	"..\..\..\pjlib\include\pj\compat\errno.h"\

 	"..\..\..\pjlib\include\pj\compat\high_precision.h"\

+	"..\..\..\pjlib\include\pj\compat\m_auto.h"\

+	"..\..\..\pjlib\include\pj\compat\os_auto.h"\

 	"..\..\..\pjlib\include\pj\compat\os_darwinos.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux.h"\

 	"..\..\..\pjlib\include\pj\compat\os_linux_kernel.h"\

@@ -720,6 +758,7 @@ DEP_CPP_PJSUA=\
 	"..\..\..\pjlib\include\pj\compat\string.h"\

 	"..\..\..\pjlib\include\pj\config.h"\

 	"..\..\..\pjlib\include\pj\config_site.h"\

+	"..\..\..\pjlib\include\pj\config_site_sample.h"\

 	"..\..\..\pjlib\include\pj\ctype.h"\

 	"..\..\..\pjlib\include\pj\errno.h"\

 	"..\..\..\pjlib\include\pj\except.h"\

@@ -729,6 +768,7 @@ DEP_CPP_PJSUA=\
 	"..\..\..\pjlib\include\pj\guid.h"\

 	"..\..\..\pjlib\include\pj\hash.h"\

 	"..\..\..\pjlib\include\pj\ioqueue.h"\

+	"..\..\..\pjlib\include\pj\ip_helper.h"\

 	"..\..\..\pjlib\include\pj\list.h"\

 	"..\..\..\pjlib\include\pj\list_i.h"\

 	"..\..\..\pjlib\include\pj\lock.h"\

@@ -736,6 +776,7 @@ DEP_CPP_PJSUA=\
 	"..\..\..\pjlib\include\pj\os.h"\

 	"..\..\..\pjlib\include\pj\pool.h"\

 	"..\..\..\pjlib\include\pj\pool_alt.h"\

+	"..\..\..\pjlib\include\pj\pool_buf.h"\

 	"..\..\..\pjlib\include\pj\pool_i.h"\

 	"..\..\..\pjlib\include\pj\rand.h"\

 	"..\..\..\pjlib\include\pj\rbtree.h"\

@@ -749,22 +790,29 @@ DEP_CPP_PJSUA=\
 	"..\..\..\pjlib\include\pjlib.h"\

 	"..\..\..\pjmedia\include\pjmedia-codec.h"\

 	"..\..\..\pjmedia\include\pjmedia-codec\config.h"\

+	"..\..\..\pjmedia\include\pjmedia-codec\config_auto.h"\

 	"..\..\..\pjmedia\include\pjmedia-codec\gsm.h"\

 	"..\..\..\pjmedia\include\pjmedia-codec\ilbc.h"\

 	"..\..\..\pjmedia\include\pjmedia-codec\l16.h"\

 	"..\..\..\pjmedia\include\pjmedia-codec\speex.h"\

 	"..\..\..\pjmedia\include\pjmedia-codec\types.h"\

 	"..\..\..\pjmedia\include\pjmedia.h"\

+	"..\..\..\pjmedia\include\pjmedia\alaw_ulaw.h"\

+	"..\..\..\pjmedia\include\pjmedia\bidirectional.h"\

 	"..\..\..\pjmedia\include\pjmedia\clock.h"\

 	"..\..\..\pjmedia\include\pjmedia\codec.h"\

 	"..\..\..\pjmedia\include\pjmedia\conference.h"\

 	"..\..\..\pjmedia\include\pjmedia\config.h"\

+	"..\..\..\pjmedia\include\pjmedia\config_auto.h"\

+	"..\..\..\pjmedia\include\pjmedia\echo.h"\

+	"..\..\..\pjmedia\include\pjmedia\echo_port.h"\

 	"..\..\..\pjmedia\include\pjmedia\endpoint.h"\

 	"..\..\..\pjmedia\include\pjmedia\errno.h"\

 	"..\..\..\pjmedia\include\pjmedia\g711.h"\

 	"..\..\..\pjmedia\include\pjmedia\jbuf.h"\

 	"..\..\..\pjmedia\include\pjmedia\master_port.h"\

 	"..\..\..\pjmedia\include\pjmedia\mem_port.h"\

+	"..\..\..\pjmedia\include\pjmedia\mp3_port.h"\

 	"..\..\..\pjmedia\include\pjmedia\null_port.h"\

 	"..\..\..\pjmedia\include\pjmedia\plc.h"\

 	"..\..\..\pjmedia\include\pjmedia\port.h"\

@@ -779,23 +827,38 @@ DEP_CPP_PJSUA=\
 	"..\..\..\pjmedia\include\pjmedia\sound_port.h"\

 	"..\..\..\pjmedia\include\pjmedia\splitcomb.h"\

 	"..\..\..\pjmedia\include\pjmedia\stream.h"\

+	"..\..\..\pjmedia\include\pjmedia\tonegen.h"\

 	"..\..\..\pjmedia\include\pjmedia\transport.h"\

+	"..\..\..\pjmedia\include\pjmedia\transport_ice.h"\

 	"..\..\..\pjmedia\include\pjmedia\transport_udp.h"\

 	"..\..\..\pjmedia\include\pjmedia\types.h"\

+	"..\..\..\pjmedia\include\pjmedia\wav_playlist.h"\

 	"..\..\..\pjmedia\include\pjmedia\wav_port.h"\

 	"..\..\..\pjmedia\include\pjmedia\wave.h"\

+	"..\..\..\pjnath\include\pjnath\config.h"\

+	"..\..\..\pjnath\include\pjnath\ice_session.h"\

+	"..\..\..\pjnath\include\pjnath\ice_strans.h"\

+	"..\..\..\pjnath\include\pjnath\stun_auth.h"\

+	"..\..\..\pjnath\include\pjnath\stun_config.h"\

+	"..\..\..\pjnath\include\pjnath\stun_msg.h"\

+	"..\..\..\pjnath\include\pjnath\stun_session.h"\

+	"..\..\..\pjnath\include\pjnath\stun_transaction.h"\

+	"..\..\..\pjnath\include\pjnath\types.h"\

 	"..\..\..\pjsip\include\pjsip-simple\evsub.h"\

 	"..\..\..\pjsip\include\pjsip-simple\iscomposing.h"\

 	"..\..\..\pjsip\include\pjsip-simple\pidf.h"\

 	"..\..\..\pjsip\include\pjsip-simple\presence.h"\

+	"..\..\..\pjsip\include\pjsip-simple\publish.h"\

 	"..\..\..\pjsip\include\pjsip-simple\types.h"\

 	"..\..\..\pjsip\include\pjsip-simple\xpidf.h"\

 	"..\..\..\pjsip\include\pjsip-ua\sip_inv.h"\

 	"..\..\..\pjsip\include\pjsip-ua\sip_regc.h"\

+	"..\..\..\pjsip\include\pjsip-ua\sip_replaces.h"\

 	"..\..\..\pjsip\include\pjsip-ua\sip_xfer.h"\

 	"..\..\..\pjsip\include\pjsip.h"\

 	"..\..\..\pjsip\include\pjsip\sip_auth.h"\

 	"..\..\..\pjsip\include\pjsip\sip_auth_msg.h"\

+	"..\..\..\pjsip\include\pjsip\sip_autoconf.h"\

 	"..\..\..\pjsip\include\pjsip\sip_config.h"\

 	"..\..\..\pjsip\include\pjsip\sip_dialog.h"\

 	"..\..\..\pjsip\include\pjsip\sip_endpoint.h"\

@@ -810,6 +873,7 @@ DEP_CPP_PJSUA=\
 	"..\..\..\pjsip\include\pjsip\sip_transport.h"\

 	"..\..\..\pjsip\include\pjsip\sip_transport_loop.h"\

 	"..\..\..\pjsip\include\pjsip\sip_transport_tcp.h"\

+	"..\..\..\pjsip\include\pjsip\sip_transport_tls.h"\

 	"..\..\..\pjsip\include\pjsip\sip_transport_udp.h"\

 	"..\..\..\pjsip\include\pjsip\sip_types.h"\

 	"..\..\..\pjsip\include\pjsip\sip_ua_layer.h"\

@@ -821,9 +885,6 @@ DEP_CPP_PJSUA=\
 	".\pjsua_wince.h"\

 	".\StdAfx.h"\

 	

-NODEP_CPP_PJSUA=\

-	"..\..\..\pjlib-util\include\pjlib-util\stun.h"\

-	

 

 !ELSEIF  "$(CFG)" == "pjsua_wince - Win32 (WCE ARMV4T) Release"