Re #1326: Initial code integration from branch 2.0-dev to trunk as "2.0-pre-alpha-svn".

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

12 files changed, 3597 insertions, 2004 deletions

diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
index b0e2014d..902a9630 100644
--- a/pjmedia/build/Makefile
+++ b/pjmedia/build/Makefile
@@ -18,6 +18,7 @@ export PJMEDIA_LIB:=../lib/libpjmedia-$(TARGET_NAME)$(LIBEXT)
 export PJMEDIA_CODEC_LIB:=../lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT)
 export PJSDP_LIB:=../lib/libpjsdp-$(TARGET_NAME)$(LIBEXT)
 export PJMEDIA_AUDIODEV_LIB:=../lib/libpjmedia-audiodev-$(TARGET_NAME)$(LIBEXT)
+export PJMEDIA_VIDEODEV_LIB:=../lib/libpjmedia-videodev-$(TARGET_NAME)$(LIBEXT)
 
 
 ###############################################################################
@@ -27,14 +28,16 @@ export _CFLAGS 	:= $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
 		   $(CFLAGS) $(CC_INC)../include \
 		   $(CC_INC)../../pjlib/include \
 		   $(CC_INC)../../pjlib-util/include \
+		   $(CC_INC)../../pjmedia/include \
 		   $(CC_INC)../../pjnath/include \
 		   $(CC_INC)../.. \
 		   $(SRTP_INC) 
 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
 		   $(HOST_CXXFLAGS) $(CXXFLAGS)
-export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \
-		   $(subst /,$(HOST_PSEP),$(PJMEDIA_AUDIODEV_LIB)) \
+export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_VIDEODEV_LIB)) \
 		   $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \
+		   $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \
+		   $(subst /,$(HOST_PSEP),$(PJMEDIA_AUDIODEV_LIB)) \
 		   $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \
 		   $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \
 		   $(subst /,$(HOST_PSEP),$(PJNATH_LIB)) \
@@ -49,18 +52,22 @@ export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \
 #
 export PJMEDIA_SRCDIR = ../src/pjmedia
 export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
-			alaw_ulaw.o alaw_ulaw_table.o bidirectional.o clock_thread.o codec.o \
-			conference.o conf_switch.o delaybuf.o echo_common.o \
+			alaw_ulaw.o alaw_ulaw_table.o avi_player.o \
+			bidirectional.o clock_thread.o codec.o conference.o \
+			conf_switch.o converter.o  converter_libswscale.o \
+			delaybuf.o echo_common.o \
 			echo_port.o echo_suppress.o endpoint.o errno.o \
+			event.o format.o ffmpeg_util.o \
 			g711.o jbuf.o master_port.o mem_capture.o mem_player.o \
 			null_port.o plc_common.o port.o splitcomb.o \
 			resample_resample.o resample_libsamplerate.o \
 			resample_port.o rtcp.o rtcp_xr.o rtp.o \
 			sdp.o sdp_cmp.o sdp_neg.o session.o silencedet.o \
 			sound_legacy.o sound_port.o stereo_port.o \
-			stream.o tonegen.o transport_adapter_sample.o \
-			transport_ice.o transport_loop.o \
-			transport_srtp.o transport_udp.o \
+			stream_common.o stream.o tonegen.o transport_adapter_sample.o \
+			transport_ice.o transport_loop.o transport_srtp.o transport_udp.o \
+			types.o vid_codec.o vid_codec_util.o \
+			vid_port.o vid_stream.o vid_tee.o \
 			wav_player.o wav_playlist.o wav_writer.o wave.o \
 			wsola.o
 
@@ -78,6 +85,15 @@ export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
 
 
 ###############################################################################
+# Defines for building PJMEDIA-VIDEODEV library
+#
+export PJMEDIA_VIDEODEV_SRCDIR = ../src/pjmedia-videodev
+export PJMEDIA_VIDEODEV_OBJS +=  errno.o videodev.o ffmpeg_dev.o \
+				colorbar_dev.o v4l2_dev.o
+export PJMEDIA_VIDEODEV_CFLAGS += $(_CFLAGS)
+
+
+###############################################################################
 # Defines for building PJSDP library
 # Note that SDP functionality is already INCLUDED in PJMEDIA.
 # The PJSDP library should only be used for applications that want SDP
@@ -93,7 +109,8 @@ export PJSDP_CFLAGS += $(_CFLAGS)
 # Defines for building PJMEDIA-Codec library
 #
 export PJMEDIA_CODEC_SRCDIR = ../src/pjmedia-codec
-export PJMEDIA_CODEC_OBJS += \
+export PJMEDIA_CODEC_OBJS += audio_codecs.o ffmpeg_codecs.o \
+			h263_packetizer.o h264_packetizer.o \
 			$(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
 			ipp_codecs.o $(CODEC_OBJS)
 export PJMEDIA_CODEC_CFLAGS += $(_CFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \
@@ -104,7 +121,9 @@ export PJMEDIA_CODEC_CFLAGS += $(_CFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \
 # Defines for building test application
 #
 export PJMEDIA_TEST_SRCDIR = ../src/test
-export PJMEDIA_TEST_OBJS += codec_vectors.o jbuf_test.o main.o mips_test.o rtp_test.o test.o
+export PJMEDIA_TEST_OBJS += codec_vectors.o jbuf_test.o main.o mips_test.o \
+			    vid_codec_test.o vid_dev_test.o vid_port_test.o \
+			    rtp_test.o test.o
 export PJMEDIA_TEST_OBJS += sdp_neg_test.o 
 export PJMEDIA_TEST_CFLAGS += $(_CFLAGS)
 export PJMEDIA_TEST_LDFLAGS += $(_LDFLAGS)
@@ -117,7 +136,7 @@ export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT
 #
 # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory.
 #
-TARGETS := pjmedia pjmedia-audiodev pjmedia-codec pjsdp pjmedia-test
+TARGETS := pjmedia pjmedia-videodev pjmedia-audiodev pjmedia-codec pjsdp pjmedia-test
 
 all: $(TARGETS)
 
@@ -132,7 +151,7 @@ doc:
 dep: depend
 distclean: realclean
 
-.PHONY: dep depend pjmedia pjmedia-codec pjmedia-audiodev pjmedia-test clean realclean distclean
+.PHONY: dep depend pjmedia pjmedia-codec pjmedia-videodev pjmedia-audiodev pjmedia-test clean realclean distclean
 
 pjmedia:
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $(PJMEDIA_LIB)
@@ -140,6 +159,9 @@ pjmedia:
 pjmedia-codec:
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $(PJMEDIA_CODEC_LIB)
 
+pjmedia-videodev:
+	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $(PJMEDIA_VIDEODEV_LIB)
+
 pjmedia-audiodev:
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $(PJMEDIA_AUDIODEV_LIB)
 
@@ -166,18 +188,21 @@ pjmedia-test: $(PJMEDIA_LIB)
 clean:
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@
+	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $@
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $@
 	$(MAKE) -f $(RULES_MAK) APP=PJSDP app=pjsdp $@
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $@
 
 realclean:
 	$(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-$(TARGET_NAME).depend),$(HOST_RMR))
+	$(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-videodev-$(TARGET_NAME).depend),$(HOST_RMR))
 	$(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-audiodev-$(TARGET_NAME).depend),$(HOST_RMR))
 	$(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-codec-$(TARGET_NAME).depend),$(HOST_RMR))
 	$(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-test-$(TARGET_NAME).depend),$(HOST_RMR))
 	$(subst @@,$(subst /,$(HOST_PSEP),.pjsdp-$(TARGET_NAME).depend),$(HOST_RMR))
 	
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@
+	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $@
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $@
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $@
@@ -185,6 +210,7 @@ realclean:
 
 depend:
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@
+	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $@
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $@
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@
 	$(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $@
diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in
index a329f76c..044339e0 100644
--- a/pjmedia/build/os-auto.mak.in
+++ b/pjmedia/build/os-auto.mak.in
@@ -1,7 +1,35 @@
 # @configure_input@
 
+# Define the desired video device backend
+# Valid values are:
+#   - mac_os
+#   - iphone_os
+AC_PJMEDIA_VIDEO = @ac_pjmedia_video@
+
+# SDL flags
+SDL_CFLAGS = @ac_sdl_cflags@
+SDL_LDFLAGS = @ac_sdl_ldflags@
+
+# FFMPEG dlags
+FFMPEG_CFLAGS = @ac_ffmpeg_cflags@ 
+FFMPEG_LDFLAGS =  @ac_ffmpeg_ldflags@
+
+# Video4Linux2
+V4L2_CFLAGS = @ac_v4l2_cflags@
+V4L2_LDFLAGS = @ac_v4l2_ldflags@
+
+# QT
+AC_PJMEDIA_VIDEO_HAS_QT = @ac_pjmedia_video_has_qt@
+QT_CFLAGS = @ac_qt_cflags@
+
+# iOS
+IOS_CFLAGS = @ac_ios_cflags@
+
 # PJMEDIA features exclusion
-export CFLAGS += @ac_no_small_filter@ @ac_no_large_filter@ @ac_no_speex_aec@
+export CFLAGS += @ac_no_small_filter@ @ac_no_large_filter@ @ac_no_speex_aec@ \
+		 $(SDL_CFLAGS) $(FFMPEG_CFLAGS) $(V4L2_CFLAGS) $(QT_CFLAGS) \
+		 $(IOS_CFLAGS)
+export LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS)
 
 # Define the desired sound device backend
 # Valid values are:
@@ -118,4 +146,27 @@ ifeq ($(AC_PJMEDIA_SND),external)
 export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
 endif
 
+#
+# QT video device
+#
+ifeq ($(AC_PJMEDIA_VIDEO_HAS_QT),yes)
+export PJMEDIA_VIDEODEV_OBJS += qt_dev.o
+endif
+
+#
+# iOS video device
+#
+ifeq ($(AC_PJMEDIA_VIDEO),iphone_os)
+export PJMEDIA_VIDEODEV_OBJS += ios_dev.o
+endif
 
+#
+# Determine whether we should compile the obj-c version of a particular source code
+#
+ifeq ($(AC_PJMEDIA_VIDEO),$(filter $(AC_PJMEDIA_VIDEO),mac_os iphone_os))
+# Mac and iPhone OS specific, use obj-c
+export PJMEDIA_VIDEODEV_OBJS += sdl_dev_m.o
+else
+# Other platforms, compile .c
+export PJMEDIA_VIDEODEV_OBJS += sdl_dev.o
+endif
diff --git a/pjmedia/build/pjaut.dsp b/pjmedia/build/pjaut.dsp
deleted file mode 100644
index 99145d35..00000000
--- a/pjmedia/build/pjaut.dsp
+++ /dev/null
@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="pjaut" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=pjaut - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "pjaut.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "pjaut.mak" CFG="pjaut - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "pjaut - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "pjaut - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "pjaut - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\output\pjaut_i386_win32_vc6_release"

-# PROP BASE Intermediate_Dir ".\output\pjaut_i386_win32_vc6_release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\output\pjaut_i386_win32_vc6_release"

-# PROP Intermediate_Dir ".\output\pjaut_i386_win32_vc6_release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../pjlib/src" /I "../src" /I "../../pjsdp/src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../bin/pjaut_vc6.exe"

-

-!ELSEIF  "$(CFG)" == "pjaut - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\output\pjaut_i386_win32_vc6_debug"

-# PROP BASE Intermediate_Dir ".\output\pjaut_i386_win32_vc6_debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\output\pjaut_i386_win32_vc6_debug"

-# PROP Intermediate_Dir ".\output\pjaut_i386_win32_vc6_debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../pjlib/src" /I "../src" /I "../../pjsdp/src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../bin/pjaut_vc6d.exe" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "pjaut - Win32 Release"

-# Name "pjaut - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\src\test\audio_tool.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/pjmedia/build/pjmedia.dsp b/pjmedia/build/pjmedia.dsp
deleted file mode 100644
index aa127e77..00000000
--- a/pjmedia/build/pjmedia.dsp
+++ /dev/null
@@ -1,488 +0,0 @@
-# Microsoft Developer Studio Project File - Name="pjmedia" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

-

-CFG=pjmedia - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "pjmedia.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "pjmedia.mak" CFG="pjmedia - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "pjmedia - Win32 Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "pjmedia - Win32 Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "pjmedia - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\output\pjmedia-i386-win32-vc6-release"

-# PROP BASE Intermediate_Dir ".\output\pjmedia-i386-win32-vc6-release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\output\pjmedia-i386-win32-vc6-release"

-# PROP Intermediate_Dir ".\output\pjmedia-i386-win32-vc6-release"

-# PROP Target_Dir ""

-F90=df.exe

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /I "../../third_party/build/srtp" /I "../../third_party/srtp/crypto/include" /I "../../third_party/srtp/include" /I "../.." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"../lib/pjmedia-i386-win32-vc6-release.lib"

-

-!ELSEIF  "$(CFG)" == "pjmedia - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\output\pjmedia-i386-win32-vc6-debug"

-# PROP BASE Intermediate_Dir ".\output\pjmedia-i386-win32-vc6-debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\output\pjmedia-i386-win32-vc6-debug"

-# PROP Intermediate_Dir ".\output\pjmedia-i386-win32-vc6-debug"

-# PROP Target_Dir ""

-F90=df.exe

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /I "../../third_party/build/srtp" /I "../../third_party/srtp/crypto/include" /I "../../third_party/srtp/include" /I "../.." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /GZ /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"../lib/pjmedia-i386-win32-vc6-debug.lib"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "pjmedia - Win32 Release"

-# Name "pjmedia - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\src\pjmedia\alaw_ulaw.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\alaw_ulaw_table.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\bidirectional.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\clock_thread.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\codec.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\conf_switch.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\conference.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\delaybuf.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\echo_common.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\echo_internal.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\echo_port.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\echo_speex.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\echo_suppress.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\endpoint.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\errno.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\g711.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\jbuf.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\master_port.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\mem_capture.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\mem_player.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\null_port.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\plc_common.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\port.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\resample_libsamplerate.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\resample_port.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\resample_resample.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\resample_speex.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\rtcp.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\rtcp_xr.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\rtp.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\sdp.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\sdp_cmp.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\sdp_neg.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\session.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\silencedet.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\sound_legacy.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\sound_port.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\splitcomb.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\stereo_port.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\stream.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\tonegen.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\transport_adapter_sample.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\transport_ice.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\transport_loop.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\transport_srtp.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\transport_udp.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\wav_player.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\wav_playlist.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\wav_writer.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\wave.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjmedia\wsola.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=..\include\pjmedia\alaw_ulaw.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\audio_dev.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\bidirectional.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\circbuf.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\clock.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\codec.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\conference.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\config.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\delaybuf.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\doxygen.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\echo.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\echo_port.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\endpoint.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\errno.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\g711.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\jbuf.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\master_port.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\mem_port.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\null_port.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\plc.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\port.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\resample.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\rtcp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\rtcp_xr.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\rtp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\sdp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\sdp_neg.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\session.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\silencedet.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\sound.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\sound_port.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\splitcomb.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\stereo.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\stream.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\tonegen.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\transport.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\transport_adapter_sample.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\transport_ice.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\transport_loop.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\transport_srtp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\transport_udp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\types.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\wav_playlist.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\wav_port.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\wave.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\include\pjmedia\wsola.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/pjmedia/build/pjmedia.dsw b/pjmedia/build/pjmedia.dsw
deleted file mode 100644
index b7147b6d..00000000
--- a/pjmedia/build/pjmedia.dsw
+++ /dev/null
@@ -1,140 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "libportaudio"="..\..\third_party\build\portaudio\libportaudio.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "libsrtp"="..\..\third_party\build\srtp\libsrtp.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "pjaut"=".\pjaut.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name pjlib

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjmedia

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "pjlib"="..\..\pjlib\build\pjlib.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "pjlib_util"="..\..\pjlib-util\build\pjlib_util.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "pjmedia"=".\pjmedia.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name pjlib

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "pjmedia_codec"=".\pjmedia_codec.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "pjmedia_test"=".\pjmedia_test.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name pjmedia

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjlib

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjsdp

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjlib_util

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libportaudio

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libsrtp

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/pjmedia/build/pjmedia.vcproj b/pjmedia/build/pjmedia.vcproj
index 3b7c518e..eca4ed6e 100644
--- a/pjmedia/build/pjmedia.vcproj
+++ b/pjmedia/build/pjmedia.vcproj
@@ -11,16 +11,16 @@
 			Name="Win32"

 		/>

 		<Platform

-			Name="Windows Mobile 6 Standard SDK (ARMV4I)"

+			Name="Pocket PC 2003 (ARMV4)"

 		/>

 		<Platform

-			Name="Windows Mobile 6 Professional SDK (ARMV4I)"

+			Name="Smartphone 2003 (ARMV4)"

 		/>

 		<Platform

-			Name="Pocket PC 2003 (ARMV4)"

+			Name="Windows Mobile 6 Standard SDK (ARMV4I)"

 		/>

 		<Platform

-			Name="Smartphone 2003 (ARMV4)"

+			Name="Windows Mobile 6 Professional SDK (ARMV4I)"

 		/>

 		<Platform

 			Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

@@ -34,11 +34,11 @@
 	<Configurations>

 		<Configuration

 			Name="Release|Win32"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="2"


 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"

 			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -57,8 +57,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				AdditionalIncludeDirectories="../include;../../pjlib/include;&quot;../../pjlib-util/include&quot;;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;&quot;$(DXSDK_DIR)include&quot;"

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -90,11 +90,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Release|Pocket PC 2003 (ARMV4)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -113,9 +113,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -129,7 +129,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -156,11 +156,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Release|Smartphone 2003 (ARMV4)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -179,9 +179,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -195,7 +195,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -223,11 +223,11 @@
 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="2"


 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"

 			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -246,8 +246,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				AdditionalIncludeDirectories="../include;../../pjlib/include;&quot;../../pjlib-util/include&quot;;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;&quot;$(DXSDK_DIR)include&quot;"

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -261,6 +261,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

+				IgnoreDefaultLibraryNames=""

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -279,11 +280,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Debug|Pocket PC 2003 (ARMV4)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -302,9 +303,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -318,7 +319,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -345,11 +346,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Debug|Smartphone 2003 (ARMV4)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -368,9 +369,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -384,7 +385,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -412,11 +413,11 @@
 		</Configuration>

 		<Configuration

 			Name="Debug-Static|Win32"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="2"


 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"

 			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -435,8 +436,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				AdditionalIncludeDirectories="../include;../../pjlib/include;&quot;../../pjlib-util/include&quot;;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;&quot;$(DXSDK_DIR)include&quot;"

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -468,11 +469,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Debug-Static|Pocket PC 2003 (ARMV4)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -491,9 +492,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -507,7 +508,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -534,11 +535,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Debug-Static|Smartphone 2003 (ARMV4)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -557,9 +558,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -573,7 +574,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -601,11 +602,11 @@
 		</Configuration>

 		<Configuration

 			Name="Release-Dynamic|Win32"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="2"


 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"

 			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -624,8 +625,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				AdditionalIncludeDirectories="../include;../../pjlib/include;&quot;../../pjlib-util/include&quot;;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;&quot;$(DXSDK_DIR)include&quot;"

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -657,11 +658,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -680,9 +681,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -696,7 +697,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -723,11 +724,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Release-Dynamic|Smartphone 2003 (ARMV4)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -746,9 +747,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -762,7 +763,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -790,11 +791,11 @@
 		</Configuration>

 		<Configuration

 			Name="Debug-Dynamic|Win32"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="2"


 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"

 			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -813,8 +814,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				AdditionalIncludeDirectories="../include;../../pjlib/include;&quot;../../pjlib-util/include&quot;;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;&quot;$(DXSDK_DIR)include&quot;"

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -846,11 +847,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -869,9 +870,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -885,7 +886,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -912,11 +913,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -935,9 +936,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -951,7 +952,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -979,11 +980,11 @@
 		</Configuration>

 		<Configuration

 			Name="Release-Static|Win32"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="2"


 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"

 			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1002,8 +1003,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				AdditionalIncludeDirectories="../include;../../pjlib/include;&quot;../../pjlib-util/include&quot;;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../..;&quot;$(DXSDK_DIR)include&quot;"

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1035,11 +1036,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Release-Static|Pocket PC 2003 (ARMV4)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1058,9 +1059,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1074,7 +1075,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1101,11 +1102,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Release-Static|Smartphone 2003 (ARMV4)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1124,9 +1125,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1140,7 +1141,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1167,11 +1168,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Pocket PC 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1190,9 +1191,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1206,7 +1207,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1233,11 +1234,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Pocket PC 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1256,9 +1257,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1272,7 +1273,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1299,11 +1300,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Static|Pocket PC 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1322,9 +1323,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1338,7 +1339,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1365,11 +1366,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1388,9 +1389,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1404,7 +1405,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1431,11 +1432,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1454,9 +1455,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1470,7 +1471,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1497,11 +1498,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Static|Pocket PC 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1520,9 +1521,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1536,7 +1537,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1563,11 +1564,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Smartphone 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1586,9 +1587,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1602,7 +1603,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1629,11 +1630,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Smartphone 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1652,9 +1653,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1668,7 +1669,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1695,11 +1696,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Static|Smartphone 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1718,9 +1719,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1734,7 +1735,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1761,11 +1762,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Dynamic|Smartphone 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1784,9 +1785,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1800,7 +1801,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1827,11 +1828,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1850,9 +1851,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1866,7 +1867,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1893,11 +1894,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Static|Smartphone 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1916,9 +1917,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1932,7 +1933,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1959,11 +1960,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1982,9 +1983,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1998,7 +1999,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2025,11 +2026,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2048,9 +2049,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -2064,7 +2065,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2091,11 +2092,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2114,9 +2115,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -2130,7 +2131,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2157,11 +2158,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2180,9 +2181,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -2196,7 +2197,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2223,11 +2224,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2246,9 +2247,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -2262,7 +2263,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2289,11 +2290,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2312,9 +2313,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -2328,7 +2329,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2355,11 +2356,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2378,9 +2379,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -2394,7 +2395,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2421,11 +2422,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2444,9 +2445,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -2460,7 +2461,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2487,11 +2488,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2510,9 +2511,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -2526,7 +2527,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2553,11 +2554,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2576,9 +2577,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -2592,7 +2593,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2619,11 +2620,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


+			Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2642,9 +2643,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -2658,7 +2659,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2686,10 +2687,10 @@
 		</Configuration>

 		<Configuration

 			Name="Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"


-			ATLMinimizesCRunTimeLibraryUsage="false"


-			CharacterSet="1"


 			ConfigurationType="4"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2708,9 +2709,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_LIB;"


 				ExecutionBucket="7"

 				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/include,../../third_party/srtp/crypto/include;../.."

+				PreprocessorDefinitions="_LIB;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -2724,7 +2725,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"


+				OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2875,6 +2876,10 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\pjmedia\avi_player.c"

+				>

+			</File>

+			<File

 				RelativePath="..\src\pjmedia\bidirectional.c"

 				>

 				<FileConfiguration

@@ -3111,6 +3116,14 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\pjmedia\converter.c"

+				>

+			</File>

+			<File

+				RelativePath="..\src\pjmedia\converter_libswscale.c"

+				>

+			</File>

+			<File

 				RelativePath="..\src\pjmedia\delaybuf.c"

 				>

 			</File>

@@ -3463,6 +3476,18 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\pjmedia\event.c"

+				>

+			</File>

+			<File

+				RelativePath="..\src\pjmedia\ffmpeg_util.c"

+				>

+			</File>

+			<File

+				RelativePath="..\src\pjmedia\format.c"

+				>

+			</File>

+			<File

 				RelativePath="..\src\pjmedia\g711.c"

 				>

 				<FileConfiguration

@@ -4291,64 +4316,6 @@
 				</FileConfiguration>

 			</File>

 			<File

-				RelativePath="..\src\pjmedia\session.c"

-				>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug-Static|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release-Dynamic|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug-Dynamic|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release-Static|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-					/>

-				</FileConfiguration>

-			</File>

-			<File

 				RelativePath="..\src\pjmedia\silencedet.c"

 				>

 				<FileConfiguration

@@ -4589,6 +4556,10 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\pjmedia\stream_common.c"

+				>

+			</File>

+			<File

 				RelativePath="..\src\pjmedia\tonegen.c"

 				>

 				<FileConfiguration

@@ -4721,6 +4692,30 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\pjmedia\types.c"

+				>

+			</File>

+			<File

+				RelativePath="..\src\pjmedia\vid_codec.c"

+				>

+			</File>

+			<File

+				RelativePath="..\src\pjmedia\vid_codec_util.c"

+				>

+			</File>

+			<File

+				RelativePath="..\src\pjmedia\vid_port.c"

+				>

+			</File>

+			<File

+				RelativePath="..\src\pjmedia\vid_stream.c"

+				>

+			</File>

+			<File

+				RelativePath="..\src\pjmedia\vid_tee.c"

+				>

+			</File>

+			<File

 				RelativePath="..\src\pjmedia\wav_player.c"

 				>

 				<FileConfiguration

@@ -4966,6 +4961,14 @@
 				>

 			</File>

 			<File

+				RelativePath="..\include\pjmedia\avi.h"

+				>

+			</File>

+			<File

+				RelativePath="..\include\pjmedia\avi_stream.h"

+				>

+			</File>

+			<File

 				RelativePath="..\include\pjmedia\bidirectional.h"

 				>

 			</File>

@@ -4990,6 +4993,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\include\pjmedia\converter.h"

+				>

+			</File>

+			<File

 				RelativePath="..\include\pjmedia\delaybuf.h"

 				>

 			</File>

@@ -5014,6 +5021,18 @@
 				>

 			</File>

 			<File

+				RelativePath="..\include\pjmedia\event.h"

+				>

+			</File>

+			<File

+				RelativePath="..\include\pjmedia\format.h"

+				>

+			</File>

+			<File

+				RelativePath="..\include\pjmedia\frame.h"

+				>

+			</File>

+			<File

 				RelativePath="..\include\pjmedia\g711.h"

 				>

 			</File>

@@ -5070,7 +5089,7 @@
 				>

 			</File>

 			<File

-				RelativePath="..\include\pjmedia\session.h"

+				RelativePath="..\include\pjmedia\signatures.h"

 				>

 			</File>

 			<File

@@ -5098,6 +5117,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\include\pjmedia\stream_common.h"

+				>

+			</File>

+			<File

 				RelativePath="..\include\pjmedia\tonegen.h"

 				>

 			</File>

@@ -5130,6 +5153,26 @@
 				>

 			</File>

 			<File

+				RelativePath="..\include\pjmedia\vid_codec.h"

+				>

+			</File>

+			<File

+				RelativePath="..\include\pjmedia\vid_codec_util.h"

+				>

+			</File>

+			<File

+				RelativePath="..\include\pjmedia\vid_port.h"

+				>

+			</File>

+			<File

+				RelativePath="..\include\pjmedia\vid_stream.h"

+				>

+			</File>

+			<File

+				RelativePath="..\include\pjmedia\vid_tee.h"

+				>

+			</File>

+			<File

 				RelativePath="..\include\pjmedia\wav_playlist.h"

 				>

 			</File>

diff --git a/pjmedia/build/pjmedia_audiodev.dsp b/pjmedia/build/pjmedia_audiodev.dsp
deleted file mode 100644
index 0c2266fe..00000000
--- a/pjmedia/build/pjmedia_audiodev.dsp
+++ /dev/null
@@ -1,154 +0,0 @@
-# Microsoft Developer Studio Project File - Name="pjmedia_audiodev" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

-

-CFG=pjmedia_audiodev - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "pjmedia_audiodev.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "pjmedia_audiodev.mak" CFG="pjmedia_audiodev - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "pjmedia_audiodev - Win32 Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "pjmedia_audiodev - Win32 Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "pjmedia_audiodev - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\output\pjmedia-audiodev-i386-win32-vc6-release"

-# PROP BASE Intermediate_Dir ".\output\pjmedia-audiodev-i386-win32-vc6-release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\output\pjmedia-audiodev-i386-win32-vc6-release"

-# PROP Intermediate_Dir ".\output\pjmedia-audiodev-i386-win32-vc6-release"

-# PROP Target_Dir ""

-F90=df.exe

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /I "../../third_party/build/srtp" /I "../../third_party/srtp/crypto/include" /I "../../third_party/srtp/include" /I "../.." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"../lib/pjmedia-audiodev-i386-win32-vc6-release.lib"

-

-!ELSEIF  "$(CFG)" == "pjmedia_audiodev - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\output\pjmedia_audiodev-i386-win32-vc6-debug"

-# PROP BASE Intermediate_Dir ".\output\pjmedia_audiodev-i386-win32-vc6-debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\output\pjmedia-audiodev-i386-win32-vc6-debug"

-# PROP Intermediate_Dir ".\output\pjmedia-audiodev-i386-win32-vc6-debug"

-# PROP Target_Dir ""

-F90=df.exe

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /I "../../third_party/build/srtp" /I "../../third_party/srtp/crypto/include" /I "../../third_party/srtp/include" /I "../.." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /GZ /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"../lib/pjmedia-audiodev-i386-win32-vc6-debug.lib"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "pjmedia_audiodev - Win32 Release"

-# Name "pjmedia_audiodev - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE="..\src\pjmedia-audiodev\audiodev.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-audiodev\audiotest.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-audiodev\errno.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-audiodev\legacy_dev.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-audiodev\null_dev.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-audiodev\pa_dev.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-audiodev\symb_aps_dev.cpp"

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-audiodev\symb_mda_dev.cpp"

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-audiodev\wmme_dev.c"

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE="..\include\pjmedia-audiodev\audiodev.h"

-# End Source File

-# Begin Source File

-

-SOURCE="..\include\pjmedia-audiodev\audiodev_imp.h"

-# End Source File

-# Begin Source File

-

-SOURCE="..\include\pjmedia-audiodev\audiotest.h"

-# End Source File

-# Begin Source File

-

-SOURCE="..\include\pjmedia-audiodev\config.h"

-# End Source File

-# Begin Source File

-

-SOURCE="..\include\pjmedia-audiodev\errno.h"

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/pjmedia/build/pjmedia_codec.dsp b/pjmedia/build/pjmedia_codec.dsp
deleted file mode 100644
index 3f9eb75f..00000000
--- a/pjmedia/build/pjmedia_codec.dsp
+++ /dev/null
@@ -1,223 +0,0 @@
-# Microsoft Developer Studio Project File - Name="pjmedia_codec" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

-

-CFG=pjmedia_codec - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "pjmedia_codec.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "pjmedia_codec.mak" CFG="pjmedia_codec - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "pjmedia_codec - Win32 Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "pjmedia_codec - Win32 Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "pjmedia_codec - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\output\pjmedia-codec-i386-win32-vc6-debug"

-# PROP BASE Intermediate_Dir ".\output\pjmedia-codec-i386-win32-vc6-release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\output\pjmedia-codec-i386-win32-vc6-release"

-# PROP Intermediate_Dir ".\output\pjmedia-codec-i386-win32-vc6-release"

-# PROP Target_Dir ""

-F90=df.exe

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../src/pjmedia-codec" /I "../../third_party" /I "../../third_party/speex/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "HAVE_CONFIG_H" /FR /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"..\lib\pjmedia-codec-i386-win32-vc6-release.lib"

-

-!ELSEIF  "$(CFG)" == "pjmedia_codec - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\output\pjmedia-codec-i386-win32-vc6-debug"

-# PROP BASE Intermediate_Dir ".\output\pjmedia-codec-i386-win32-vc6-debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\output\pjmedia-codec-i386-win32-vc6-debug"

-# PROP Intermediate_Dir ".\output\pjmedia-codec-i386-win32-vc6-debug"

-# PROP Target_Dir ""

-F90=df.exe

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W4 /Gm /ZI /Od /I "../include" /I "../../pjlib/include" /I "../src/pjmedia-codec" /I "../../third_party" /I "../../third_party/speex/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "HAVE_CONFIG_H" /FR /FD /GZ /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"..\lib\pjmedia-codec-i386-win32-vc6-debug.lib"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "pjmedia_codec - Win32 Release"

-# Name "pjmedia_codec - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Group "g722 Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\g722\g722_dec.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\g722\g722_dec.h"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\g722\g722_enc.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\g722\g722_enc.h"

-# End Source File

-# End Group

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\g722.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\g7221.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\gsm.c"

-

-!IF  "$(CFG)" == "pjmedia_codec - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "pjmedia_codec - Win32 Debug"

-

-# ADD CPP /W4

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\ilbc.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\ipp_codecs.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\l16.c"

-

-!IF  "$(CFG)" == "pjmedia_codec - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "pjmedia_codec - Win32 Debug"

-

-# ADD CPP /W4

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\passthrough.c"

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\pjmedia-codec\speex_codec.c"

-

-!IF  "$(CFG)" == "pjmedia_codec - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "pjmedia_codec - Win32 Debug"

-

-# ADD CPP /W4

-

-!ENDIF 

-

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE="..\include\pjmedia-codec\amr_helper.h"

-# End Source File

-# Begin Source File

-

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

-# End Source File

-# Begin Source File

-

-SOURCE="..\include\pjmedia-codec\g722.h"

-# End Source File

-# Begin Source File

-

-SOURCE="..\include\pjmedia-codec\g7221.h"

-# End Source File

-# Begin Source File

-

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

-# End Source File

-# Begin Source File

-

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

-# End Source File

-# Begin Source File

-

-SOURCE="..\include\pjmedia-codec\ipp_codecs.h"

-# End Source File

-# Begin Source File

-

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

-# End Source File

-# Begin Source File

-

-SOURCE="..\include\pjmedia-codec\passthrough.h"

-# End Source File

-# Begin Source File

-

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

-# End Source File

-# Begin Source File

-

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

-# End Source File

-# Begin Source File

-

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

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/pjmedia/build/pjmedia_codec.vcproj b/pjmedia/build/pjmedia_codec.vcproj
index 25cf77bf..d16e73f7 100644
--- a/pjmedia/build/pjmedia_codec.vcproj
+++ b/pjmedia/build/pjmedia_codec.vcproj
@@ -2765,6 +2765,10 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 			>

 			<File

+				RelativePath="..\src\pjmedia-codec\ffmpeg_codecs.c"

+				>

+			</File>

+			<File

 				RelativePath="..\src\pjmedia-codec\g722.c"

 				>

 			</File>

@@ -2831,6 +2835,14 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\pjmedia-codec\h263_packetizer.c"

+				>

+			</File>

+			<File

+				RelativePath="..\src\pjmedia-codec\h264_packetizer.c"

+				>

+			</File>

+			<File

 				RelativePath="..\src\pjmedia-codec\ilbc.c"

 				>

 				<FileConfiguration

@@ -3046,6 +3058,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\include\pjmedia-codec\ffmpeg_codecs.h"

+				>

+			</File>

+			<File

 				RelativePath="..\include\pjmedia-codec\g722.h"

 				>

 			</File>

@@ -3058,6 +3074,14 @@
 				>

 			</File>

 			<File

+				RelativePath="..\include\pjmedia-codec\h263_packetizer.h"

+				>

+			</File>

+			<File

+				RelativePath="..\include\pjmedia-codec\h264_packetizer.h"

+				>

+			</File>

+			<File

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

 				>

 			</File>

diff --git a/pjmedia/build/pjmedia_test.dsp b/pjmedia/build/pjmedia_test.dsp
deleted file mode 100644
index b5514976..00000000
--- a/pjmedia/build/pjmedia_test.dsp
+++ /dev/null
@@ -1,144 +0,0 @@
-# Microsoft Developer Studio Project File - Name="pjmedia_test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=pjmedia_test - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "pjmedia_test.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "pjmedia_test.mak" CFG="pjmedia_test - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "pjmedia_test - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "pjmedia_test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "pjmedia_test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\output\pjmedia_test_vc6_Release"

-# PROP BASE Intermediate_Dir ".\output\pjmedia_test_vc6_Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\output\pjmedia_test_vc6_Release"

-# PROP Intermediate_Dir ".\output\pjmedia_test_vc6_Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../pjlib/include" /I "../include" /I "../../pjnath/include" /I "../../pjlib-util/include" /D "NDEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../bin/pjmedia_test_vc6.exe"

-

-!ELSEIF  "$(CFG)" == "pjmedia_test - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\output\pjmedia_test_vc6_Debug"

-# PROP BASE Intermediate_Dir ".\output\pjmedia_test_vc6_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\output\pjmedia_test_vc6_Debug"

-# PROP Intermediate_Dir ".\output\pjmedia_test_vc6_Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../pjlib/include" /I "../include" /I "../../pjnath/include" /I "../../pjlib-util/include" /D "_DEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../bin/pjmedia_test_vc6d.exe" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "pjmedia_test - Win32 Release"

-# Name "pjmedia_test - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\src\test\codec_vectors.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\test\jbuf_test.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\test\main.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\test\mips_test.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\test\rtp_test.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\test\sdp_neg_test.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\test\sdptest.c

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\test\session_test.c

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\test\test.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=..\src\test\test.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# Begin Source File

-

-SOURCE=.\JBTEST.DAT

-# End Source File

-# End Target

-# End Project

diff --git a/pjmedia/build/pjmedia_test.vcproj b/pjmedia/build/pjmedia_test.vcproj
index bac1a3d4..5da8f9cc 100644
--- a/pjmedia/build/pjmedia_test.vcproj
+++ b/pjmedia/build/pjmedia_test.vcproj
@@ -11,16 +11,16 @@
 			Name="Win32"

 		/>

 		<Platform

-			Name="Windows Mobile 6 Standard SDK (ARMV4I)"

+			Name="Pocket PC 2003 (ARMV4)"

 		/>

 		<Platform

-			Name="Windows Mobile 6 Professional SDK (ARMV4I)"

+			Name="Smartphone 2003 (ARMV4)"

 		/>

 		<Platform

-			Name="Pocket PC 2003 (ARMV4)"

+			Name="Windows Mobile 6 Standard SDK (ARMV4I)"

 		/>

 		<Platform

-			Name="Smartphone 2003 (ARMV4)"

+			Name="Windows Mobile 6 Professional SDK (ARMV4I)"

 		/>

 		<Platform

 			Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

@@ -34,14 +34,11 @@
 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

+			ConfigurationType="1"

 			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"

-

+			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="2"

-

-			ConfigurationType="1"

-			UseOfMFC="0"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -60,9 +57,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_CONSOLE;"

-

 				AdditionalIncludeDirectories="../../pjlib/include,../include,../../pjnath/include,../../pjlib-util/include"

+				PreprocessorDefinitions="_CONSOLE;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -78,7 +74,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib  ole32.lib user32.lib"

 				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"

-

+				IgnoreDefaultLibraryNames="MSVCRT.LIB"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -106,14 +102,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"

-

+			Name="Debug|Pocket PC 2003 (ARMV4)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -148,8 +141,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -176,14 +168,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"

-

+			Name="Debug|Smartphone 2003 (ARMV4)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -218,8 +207,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -247,14 +235,11 @@
 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

+			ConfigurationType="1"

 			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"

-

+			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="2"

-

-			ConfigurationType="1"

-			UseOfMFC="0"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -273,9 +258,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_CONSOLE;"

-

 				AdditionalIncludeDirectories="../../pjlib/include,../include,../../pjnath/include,../../pjlib-util/include"

+				PreprocessorDefinitions="_CONSOLE;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -291,7 +275,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib"

 				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"

-

+				IgnoreDefaultLibraryNames=""

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -319,14 +303,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"

-

+			Name="Release|Pocket PC 2003 (ARMV4)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -361,8 +342,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -389,14 +369,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"

-

+			Name="Release|Smartphone 2003 (ARMV4)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -431,8 +408,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -460,14 +436,11 @@
 		</Configuration>

 		<Configuration

 			Name="Debug-Static|Win32"

+			ConfigurationType="1"

 			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"

-

+			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="2"

-

-			ConfigurationType="1"

-			UseOfMFC="0"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -486,9 +459,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_CONSOLE;"

-

 				AdditionalIncludeDirectories="../../pjlib/include,../include,../../pjnath/include,../../pjlib-util/include"

+				PreprocessorDefinitions="_CONSOLE;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -504,7 +476,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib  ole32.lib user32.lib"

 				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"

-

+				IgnoreDefaultLibraryNames="MSVCRT.LIB"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -532,14 +504,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"

-

+			Name="Debug-Static|Pocket PC 2003 (ARMV4)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -574,8 +543,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -602,14 +570,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"

-

+			Name="Debug-Static|Smartphone 2003 (ARMV4)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -644,8 +609,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -673,14 +637,11 @@
 		</Configuration>

 		<Configuration

 			Name="Release-Dynamic|Win32"

+			ConfigurationType="1"

 			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"

-

+			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="2"

-

-			ConfigurationType="1"

-			UseOfMFC="0"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -699,9 +660,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_CONSOLE;"

-

 				AdditionalIncludeDirectories="../../pjlib/include,../include,../../pjnath/include,../../pjlib-util/include"

+				PreprocessorDefinitions="_CONSOLE;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -717,7 +677,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib"

 				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"

-

+				IgnoreDefaultLibraryNames=""

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -745,14 +705,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"

-

+			Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -787,8 +744,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -815,14 +771,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"

-

+			Name="Release-Dynamic|Smartphone 2003 (ARMV4)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -857,8 +810,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -886,14 +838,11 @@
 		</Configuration>

 		<Configuration

 			Name="Debug-Dynamic|Win32"

+			ConfigurationType="1"

 			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"

-

+			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="2"

-

-			ConfigurationType="1"

-			UseOfMFC="0"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -912,9 +861,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_CONSOLE;"

-

 				AdditionalIncludeDirectories="../../pjlib/include,../include,../../pjnath/include,../../pjlib-util/include"

+				PreprocessorDefinitions="_CONSOLE;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -930,7 +878,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib  ole32.lib user32.lib"

 				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"

-

+				IgnoreDefaultLibraryNames="MSVCRT.LIB"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -958,14 +906,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"

-

+			Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1000,8 +945,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1028,14 +972,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"

-

+			Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1070,8 +1011,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1099,14 +1039,11 @@
 		</Configuration>

 		<Configuration

 			Name="Release-Static|Win32"

+			ConfigurationType="1"

 			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"

-

+			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="2"

-

-			ConfigurationType="1"

-			UseOfMFC="0"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1125,9 +1062,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_CONSOLE;"

-

 				AdditionalIncludeDirectories="../../pjlib/include,../include,../../pjnath/include,../../pjlib-util/include"

+				PreprocessorDefinitions="_CONSOLE;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1143,7 +1079,7 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib"

 				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"

-

+				IgnoreDefaultLibraryNames="MSVCRT.LIB"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1171,14 +1107,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"

-

+			Name="Release-Static|Pocket PC 2003 (ARMV4)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1213,8 +1146,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1241,14 +1173,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"

-

+			Name="Release-Static|Smartphone 2003 (ARMV4)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1283,8 +1212,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1311,14 +1239,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Pocket PC 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"

-

+			Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1353,8 +1278,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1381,14 +1305,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Pocket PC 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"

-

+			Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1423,8 +1344,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1451,14 +1371,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Static|Pocket PC 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"

-

+			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1493,8 +1410,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1521,14 +1437,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"

-

+			Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1563,8 +1476,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1591,14 +1503,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"

-

+			Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1633,8 +1542,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1661,14 +1569,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Static|Pocket PC 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"

-

+			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1703,8 +1608,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1731,14 +1635,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Smartphone 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"

-

+			Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1773,8 +1674,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1801,14 +1701,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Smartphone 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"

-

+			Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1843,8 +1740,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1871,14 +1767,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Static|Smartphone 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"

-

+			Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1913,8 +1806,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1941,14 +1833,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Dynamic|Smartphone 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"

-

+			Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1983,8 +1872,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2011,14 +1899,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"

-

+			Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2053,8 +1938,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2081,14 +1965,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Static|Smartphone 2003 (ARMV4)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"

-

+			Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2123,8 +2004,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2151,14 +2031,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"

-

+			Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2193,8 +2070,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2221,14 +2097,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"

-

+			Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2263,8 +2136,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2291,14 +2163,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"

-

+			Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2334,7 +2203,6 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

 				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"

-

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2361,14 +2229,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+			Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+			ConfigurationType="1"

 			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"

-

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2403,8 +2268,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2431,14 +2295,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"

-

+			Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2473,8 +2334,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2501,14 +2361,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"

-

+			Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2543,8 +2400,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2571,14 +2427,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"

-

+			Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2613,8 +2466,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2641,14 +2493,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"

-

+			Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2684,7 +2533,6 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

 				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"

-

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2711,14 +2559,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"

-

+			Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2753,8 +2598,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2781,14 +2625,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"

-

+			Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2823,8 +2664,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2851,14 +2691,11 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

-			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"

-

+			Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+			ConfigurationType="1"

+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2893,8 +2730,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

-				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"

-

+				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2922,13 +2758,10 @@
 		</Configuration>

 		<Configuration

 			Name="Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+			ConfigurationType="1"

 			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"

-

 			ATLMinimizesCRunTimeLibraryUsage="false"

-

 			CharacterSet="1"

-

-			ConfigurationType="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -2964,7 +2797,6 @@
 				Name="VCLinkerTool"

 				AdditionalDependencies="ws2.lib"

 				OutputFile="..\bin\pjmedia-test-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"

-

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -3073,7 +2905,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"

+					Name="Debug|Pocket PC 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3081,7 +2913,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"

+					Name="Debug|Smartphone 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3098,7 +2930,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"

+					Name="Release|Pocket PC 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3106,7 +2938,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"

+					Name="Release|Smartphone 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3123,7 +2955,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

+					Name="Debug-Static|Pocket PC 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3131,7 +2963,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"

+					Name="Debug-Static|Smartphone 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3148,7 +2980,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

+					Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3156,7 +2988,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"

+					Name="Release-Dynamic|Smartphone 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3173,7 +3005,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

+					Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3181,7 +3013,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"

+					Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3198,7 +3030,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

+					Name="Release-Static|Pocket PC 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3206,7 +3038,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"

+					Name="Release-Static|Smartphone 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3214,7 +3046,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Pocket PC 2003 (ARMV4)"

+					Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3222,7 +3054,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Pocket PC 2003 (ARMV4)"

+					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3230,7 +3062,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Static|Pocket PC 2003 (ARMV4)"

+					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3238,7 +3070,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"

+					Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3246,7 +3078,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"

+					Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3254,7 +3086,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Static|Pocket PC 2003 (ARMV4)"

+					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3262,7 +3094,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Smartphone 2003 (ARMV4)"

+					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3270,7 +3102,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Smartphone 2003 (ARMV4)"

+					Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3278,7 +3110,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Static|Smartphone 2003 (ARMV4)"

+					Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3286,7 +3118,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Dynamic|Smartphone 2003 (ARMV4)"

+					Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3294,7 +3126,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"

+					Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3302,7 +3134,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Static|Smartphone 2003 (ARMV4)"

+					Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3310,7 +3142,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+					Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3318,7 +3150,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+					Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3326,7 +3158,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+					Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3334,7 +3166,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+					Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3342,7 +3174,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+					Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3350,7 +3182,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+					Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3358,7 +3190,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+					Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3366,7 +3198,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+					Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3374,7 +3206,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+					Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3382,7 +3214,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+					Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3390,7 +3222,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+					Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3594,7 +3426,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"

+					Name="Debug|Pocket PC 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3602,7 +3434,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"

+					Name="Debug|Smartphone 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3620,7 +3452,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"

+					Name="Release|Pocket PC 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3628,7 +3460,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"

+					Name="Release|Smartphone 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3646,7 +3478,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

+					Name="Debug-Static|Pocket PC 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3654,7 +3486,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"

+					Name="Debug-Static|Smartphone 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3672,7 +3504,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

+					Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3680,7 +3512,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"

+					Name="Release-Dynamic|Smartphone 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3698,7 +3530,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

+					Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3706,7 +3538,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"

+					Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3724,7 +3556,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

+					Name="Release-Static|Pocket PC 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3732,7 +3564,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"

+					Name="Release-Static|Smartphone 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3740,7 +3572,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Pocket PC 2003 (ARMV4)"

+					Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3748,7 +3580,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Pocket PC 2003 (ARMV4)"

+					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3756,7 +3588,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Static|Pocket PC 2003 (ARMV4)"

+					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3764,7 +3596,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"

+					Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3772,7 +3604,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"

+					Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3780,7 +3612,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Static|Pocket PC 2003 (ARMV4)"

+					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3788,7 +3620,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Smartphone 2003 (ARMV4)"

+					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3796,7 +3628,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Smartphone 2003 (ARMV4)"

+					Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3804,7 +3636,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Static|Smartphone 2003 (ARMV4)"

+					Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3812,7 +3644,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Dynamic|Smartphone 2003 (ARMV4)"

+					Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3820,7 +3652,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"

+					Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3828,7 +3660,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Static|Smartphone 2003 (ARMV4)"

+					Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3836,7 +3668,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+					Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3844,7 +3676,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+					Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3852,7 +3684,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+					Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3860,7 +3692,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+					Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3868,7 +3700,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+					Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3876,7 +3708,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+					Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3884,7 +3716,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+					Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3892,7 +3724,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+					Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3900,7 +3732,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+					Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3908,7 +3740,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+					Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3916,7 +3748,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+					Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3946,7 +3778,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"

+					Name="Debug|Pocket PC 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3954,7 +3786,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"

+					Name="Debug|Smartphone 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3972,7 +3804,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"

+					Name="Release|Pocket PC 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3980,7 +3812,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"

+					Name="Release|Smartphone 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -3998,7 +3830,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

+					Name="Debug-Static|Pocket PC 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4006,7 +3838,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"

+					Name="Debug-Static|Smartphone 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4024,7 +3856,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

+					Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4032,7 +3864,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"

+					Name="Release-Dynamic|Smartphone 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4050,7 +3882,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

+					Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4058,7 +3890,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"

+					Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4076,7 +3908,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

+					Name="Release-Static|Pocket PC 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4084,7 +3916,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"

+					Name="Release-Static|Smartphone 2003 (ARMV4)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4092,7 +3924,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Pocket PC 2003 (ARMV4)"

+					Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4100,7 +3932,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Pocket PC 2003 (ARMV4)"

+					Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4108,7 +3940,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Static|Pocket PC 2003 (ARMV4)"

+					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4116,7 +3948,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"

+					Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4124,7 +3956,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"

+					Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4132,7 +3964,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Static|Pocket PC 2003 (ARMV4)"

+					Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4140,7 +3972,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Smartphone 2003 (ARMV4)"

+					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4148,7 +3980,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Smartphone 2003 (ARMV4)"

+					Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4156,7 +3988,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Static|Smartphone 2003 (ARMV4)"

+					Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4164,7 +3996,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Dynamic|Smartphone 2003 (ARMV4)"

+					Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4172,7 +4004,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"

+					Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4180,7 +4012,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Static|Smartphone 2003 (ARMV4)"

+					Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4188,7 +4020,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+					Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4196,7 +4028,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+					Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4204,7 +4036,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+					Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4212,7 +4044,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+					Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4220,7 +4052,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+					Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4228,7 +4060,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

+					Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4236,7 +4068,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+					Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4244,7 +4076,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+					Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4252,7 +4084,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+					Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4260,7 +4092,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+					Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4268,7 +4100,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"

+					Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

 					ExcludedFromBuild="true"

 					>

 					<Tool

@@ -4343,6 +4175,18 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath="..\src\test\vid_codec_test.c"

+				>

+			</File>

+			<File

+				RelativePath="..\src\test\vid_dev_test.c"

+				>

+			</File>

+			<File

+				RelativePath="..\src\test\vid_port_test.c"

+				>

+			</File>

+			<File

 				RelativePath="..\src\test\wince_main.c"

 				>

 				<FileConfiguration

diff --git a/pjmedia/build/pjmedia_videodev.vcproj b/pjmedia/build/pjmedia_videodev.vcproj
new file mode 100644
index 00000000..54d14f20
--- /dev/null
+++ b/pjmedia/build/pjmedia_videodev.vcproj
@@ -0,0 +1,2856 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="pjmedia_videodev"
+	ProjectGUID="{A1989FF3-9894-40F4-B5A6-6EA364476E45}"
+	RootNamespace="pjmedia_audiodev"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="Pocket PC 2003 (ARMV4)"
+		/>
+		<Platform
+			Name="Smartphone 2003 (ARMV4)"
+		/>
+		<Platform
+			Name="Windows Mobile 6 Standard SDK (ARMV4I)"
+		/>
+		<Platform
+			Name="Windows Mobile 6 Professional SDK (ARMV4I)"
+		/>
+		<Platform
+			Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+		/>
+		<Platform
+			Name="Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-videodev-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Pocket PC 2003 (ARMV4)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Smartphone 2003 (ARMV4)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-videodev-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Pocket PC 2003 (ARMV4)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Smartphone 2003 (ARMV4)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug-Static|Win32"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-videodev-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug-Static|Pocket PC 2003 (ARMV4)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug-Static|Smartphone 2003 (ARMV4)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release-Dynamic|Win32"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-videodev-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release-Dynamic|Smartphone 2003 (ARMV4)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug-Dynamic|Win32"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-videodev-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release-Static|Win32"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-videodev-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release-Static|Pocket PC 2003 (ARMV4)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release-Static|Smartphone 2003 (ARMV4)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				ExecutionBucket="7"
+				AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.."
+				PreprocessorDefinitions="_LIB;"
+				PrecompiledHeaderFile=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCCodeSignTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+			<DeploymentTool
+				ForceDirty="-1"
+				RemoteDirectory=""
+				RegisterOutput="0"
+				AdditionalFiles=""
+			/>
+			<DebuggerTool
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\src\pjmedia-videodev\colorbar_dev.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\pjmedia-videodev\dshow_dev.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\pjmedia-videodev\dshowclasses.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\pjmedia-videodev\errno.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\pjmedia-videodev\ffmpeg_dev.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\pjmedia-videodev\sdl_dev.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\pjmedia-videodev\videodev.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\include\pjmedia-videodev\config.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\pjmedia-videodev\errno.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\pjmedia-videodev\videodev.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\pjmedia-videodev\videodev_imp.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>