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

13 files changed, 838 insertions, 2077 deletions

diff --git a/pjsip-apps/build/Makefile b/pjsip-apps/build/Makefile
index 08e2ca00..146e841e 100644
--- a/pjsip-apps/build/Makefile
+++ b/pjsip-apps/build/Makefile
@@ -20,7 +20,7 @@ PJSUA_LIB_LIB=../../pjsip/lib/libpjsua-$(TARGET_NAME)$(LIBEXT)
 # Gather all flags.
 #
 export _CFLAGS 	:= $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
-		   $(CFLAGS) $(CC_INC)../../pjsip/include \
+		   $(PJ_CFLAGS) $(CFLAGS) $(CC_INC)../../pjsip/include \
 		   $(CC_INC)../../pjlib/include \
 		   $(CC_INC)../../pjlib-util/include \
 		   $(CC_INC)../../pjnath/include \
diff --git a/pjsip-apps/build/Samples-vc.mak b/pjsip-apps/build/Samples-vc.mak
index b938e2c0..b3a76e6b 100644
--- a/pjsip-apps/build/Samples-vc.mak
+++ b/pjsip-apps/build/Samples-vc.mak
@@ -21,6 +21,7 @@ PJNATH_LIB = ..\..\pjnath\lib\pjnath-$(TARGET)$(LIBEXT)
 PJMEDIA_LIB = ..\..\pjmedia\lib\pjmedia-$(TARGET)$(LIBEXT)
 PJMEDIA_CODEC_LIB = ..\..\pjmedia\lib\pjmedia-codec-$(TARGET)$(LIBEXT)
 PJMEDIA_AUDIODEV_LIB = ..\..\pjmedia\lib\pjmedia-audiodev-$(TARGET)$(LIBEXT)
+PJMEDIA_VIDEODEV_LIB = ..\..\pjmedia\lib\pjmedia-videodev-$(TARGET)$(LIBEXT)
 PJSIP_LIB = ..\..\pjsip\lib\pjsip-core-$(TARGET)$(LIBEXT)
 PJSIP_UA_LIB = ..\..\pjsip\lib\pjsip-ua-$(TARGET)$(LIBEXT)
 PJSIP_SIMPLE_LIB = ..\..\pjsip\lib\pjsip-simple-$(TARGET)$(LIBEXT)
@@ -39,6 +40,7 @@ THIRD_PARTY_LIBS = $(GSM_LIB) $(ILBC_LIB) $(PORTAUDIO_LIB) $(RESAMPLE_LIB) \
 
 LIBS = $(PJSUA_LIB_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE_LIB) \
 	  $(PJSIP_LIB) $(PJMEDIA_CODEC_LIB) $(PJMEDIA_AUDIODEV_LIB) \
+	  $(PJMEDIA_VIDEODEV_LIB) \
 	  $(PJMEDIA_LIB) $(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB) \
 	  $(THIRD_PARTY_LIBS)
 
@@ -60,6 +62,7 @@ BINDIR = ..\bin\samples\$(TARGET)
 
 SAMPLES = $(BINDIR)\auddemo.exe \
 	  $(BINDIR)\aectest.exe \
+	  $(BINDIR)\aviplay.exe \
 	  $(BINDIR)\confsample.exe \
 	  $(BINDIR)\confbench.exe \
 	  $(BINDIR)\encdec.exe \
@@ -84,7 +87,8 @@ SAMPLES = $(BINDIR)\auddemo.exe \
 	  $(BINDIR)\stereotest.exe \
 	  $(BINDIR)\streamutil.exe \
 	  $(BINDIR)\strerror.exe \
-	  $(BINDIR)\tonegen.exe
+	  $(BINDIR)\tonegen.exe \
+	  $(BINDIR)\vid_streamutil.exe
 
 
 all: $(BINDIR) $(OBJDIR) $(SAMPLES)
diff --git a/pjsip-apps/build/Samples.mak b/pjsip-apps/build/Samples.mak
index bba68b46..ee16e52e 100644
--- a/pjsip-apps/build/Samples.mak
+++ b/pjsip-apps/build/Samples.mak
@@ -14,7 +14,9 @@ OBJDIR := ./output/samples-$(TARGET_NAME)
 BINDIR := ../bin/samples/$(TARGET_NAME)
 
 SAMPLES := auddemo \
+	   aviplay \
 	   aectest \
+	   aviplay \
 	   confsample \
 	   encdec \
 	   httpdemo \
@@ -38,7 +40,8 @@ SAMPLES := auddemo \
 	   stereotest \
 	   streamutil \
 	   strerror \
-	   tonegen
+	   tonegen \
+	   vid_streamutil
 
 EXES := $(foreach file, $(SAMPLES), $(BINDIR)/$(file)$(HOST_EXE))
 
diff --git a/pjsip-apps/build/pjsip_apps.dsw b/pjsip-apps/build/pjsip_apps.dsw
deleted file mode 100644
index 6945bc53..00000000
--- a/pjsip-apps/build/pjsip_apps.dsw
+++ /dev/null
@@ -1,443 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

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

-

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

-

-Project: "libg7221codec"="..\..\third_party\build\g7221\libg7221codec.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

-Project: "libgsmcodec"="..\..\third_party\build\gsm\libgsmcodec.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

-Project: "libilbccodec"="..\..\third_party\build\ilbc\libilbccodec.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

-Project: "libresample"="..\..\third_party\build\resample\libresample.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

-Project: "libspeex"="..\..\third_party\build\speex\libspeex.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

-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\build\pjmedia.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name pjlib

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjlib_util

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjmedia

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjmedia_codec

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjsip_core

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjsip_simple

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjsip_ua

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjsua_lib

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjnath

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libgsmcodec

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libilbccodec

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libportaudio

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libresample

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libspeex

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjmedia_audiodev

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libsrtp

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libg7221codec

-    End Project Dependency

-}}}

-

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

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libgsmcodec

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libilbccodec

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libportaudio

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libresample

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libspeex

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libsrtp

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjlib

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjlib_util

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjmedia

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjmedia_codec

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjnath

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjsip_core

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjsip_simple

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjsip_ua

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjsua_lib

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjmedia_audiodev

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libg7221codec

-    End Project Dependency

-}}}

-

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

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name pjlib

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjlib_util

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjmedia

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjmedia_codec

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjsip_core

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjsip_simple

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjsip_ua

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjsua_lib

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libgsmcodec

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libilbccodec

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libportaudio

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libresample

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libspeex

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libsrtp

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjmedia_audiodev

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjnath

-    End Project Dependency

-}}}

-

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

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name pjlib

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjlib_util

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjmedia

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjmedia_codec

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjsip_core

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjsip_simple

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjsip_ua

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name pjsua_lib

-    End Project Dependency

-}}}

-

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

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

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

-

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

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

-# ** DO NOT EDIT **

-

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

-

-CFG=pjsua - 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 "pjsua.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 "pjsua.mak" CFG="pjsua - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

-!MESSAGE "pjsua - 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)" == "pjsua - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

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

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

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

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

-# PROP Intermediate_Dir ".\output\pjsua-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 /W4 /GX /Zi /O2 /I "../../pjsip/include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjmedia/include" /I "../../pjnath/include" /D "NDEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /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

-LINK32=link.exe

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

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

-# SUBTRACT LINK32 /pdb:none

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

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

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

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

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

-# PROP Intermediate_Dir ".\output\pjsua-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 /W4 /Gm /GX /ZI /Od /I "../../pjsip/include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjmedia/include" /I "../../pjnath/include" /D "_DEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /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

-LINK32=link.exe

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

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

-

-!ENDIF 

-

-# Begin Target

-

-# Name "pjsua - Win32 Release"

-# Name "pjsua - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

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

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjsua\pjsua_app.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/pjsip-apps/build/pjsua.vcproj b/pjsip-apps/build/pjsua.vcproj
index 3c6c1f62..717d7dca 100644
--- a/pjsip-apps/build/pjsua.vcproj
+++ b/pjsip-apps/build/pjsua.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="1"

+			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="_CONSOLE;"


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

+				PreprocessorDefinitions="_CONSOLE;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -100,12 +100,12 @@
 			/>

 		</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="1"

+			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"

@@ -140,7 +140,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

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


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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -167,12 +167,12 @@
 			/>

 		</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="1"

+			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"

@@ -207,7 +207,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

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


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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -234,12 +234,12 @@
 			/>

 		</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="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"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -258,8 +258,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

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

+				PreprocessorDefinitions="_CONSOLE;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -273,40 +273,41 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

+				IgnoreDefaultLibraryNames="msvcrt.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

 			/>

 			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

 				Name="VCXDCMakeTool"

 			/>

 			<Tool

 				Name="VCBscMakeTool"

 			/>

 			<Tool

-				Name="VCCodeSignTool"

+				Name="VCFxCopTool"

 			/>

 			<Tool

-				Name="VCPostBuildEventTool"

+				Name="VCAppVerifierTool"

 			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

+			<Tool

+				Name="VCWebDeploymentTool"

 			/>

-			<DebuggerTool

+			<Tool

+				Name="VCPostBuildEventTool"

 			/>

 		</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|Pocket PC 2003 (ARMV4)"

 			ConfigurationType="1"

+			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"

@@ -340,8 +341,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

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

 		</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="Debug|Smartphone 2003 (ARMV4)"

 			ConfigurationType="1"

+			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"

@@ -407,8 +408,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

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

 		</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-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"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -459,8 +460,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

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

+				PreprocessorDefinitions="_CONSOLE;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -474,40 +475,40 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

 			/>

 			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

 				Name="VCXDCMakeTool"

 			/>

 			<Tool

 				Name="VCBscMakeTool"

 			/>

 			<Tool

-				Name="VCCodeSignTool"

+				Name="VCFxCopTool"

 			/>

 			<Tool

-				Name="VCPostBuildEventTool"

+				Name="VCAppVerifierTool"

 			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

+			<Tool

+				Name="VCWebDeploymentTool"

 			/>

-			<DebuggerTool

+			<Tool

+				Name="VCPostBuildEventTool"

 			/>

 		</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"


+			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"

 			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -526,7 +527,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_CONSOLE;"


+				ExecutionBucket="7"

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

 				PrecompiledHeaderFile=""

 			/>

@@ -542,39 +543,39 @@
 			<Tool

 				Name="VCLinkerTool"

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

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

 			/>

 			<Tool

 				Name="VCALinkTool"

 			/>

 			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

 				Name="VCXDCMakeTool"

 			/>

 			<Tool

 				Name="VCBscMakeTool"

 			/>

 			<Tool

-				Name="VCFxCopTool"

+				Name="VCCodeSignTool"

 			/>

 			<Tool

-				Name="VCAppVerifierTool"

+				Name="VCPostBuildEventTool"

 			/>

-			<Tool

-				Name="VCWebDeploymentTool"

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

 			/>

-			<Tool

-				Name="VCPostBuildEventTool"

+			<DebuggerTool

 			/>

 		</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-Static|Smartphone 2003 (ARMV4)"

 			ConfigurationType="1"

+			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"

@@ -609,7 +610,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

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


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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -636,12 +637,12 @@
 			/>

 		</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="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"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -660,8 +661,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

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

+				PreprocessorDefinitions="_CONSOLE;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -675,40 +676,40 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

 			/>

 			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

 				Name="VCXDCMakeTool"

 			/>

 			<Tool

 				Name="VCBscMakeTool"

 			/>

 			<Tool

-				Name="VCCodeSignTool"

+				Name="VCFxCopTool"

 			/>

 			<Tool

-				Name="VCPostBuildEventTool"

+				Name="VCAppVerifierTool"

 			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

+			<Tool

+				Name="VCWebDeploymentTool"

 			/>

-			<DebuggerTool

+			<Tool

+				Name="VCPostBuildEventTool"

 			/>

 		</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-Dynamic|Pocket PC 2003 (ARMV4)"

 			ConfigurationType="1"

+			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"

@@ -742,8 +743,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -770,12 +771,12 @@
 			/>

 		</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="Release-Dynamic|Smartphone 2003 (ARMV4)"

 			ConfigurationType="1"

+			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"

@@ -809,8 +810,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -837,12 +838,12 @@
 			/>

 		</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="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"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -861,8 +862,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

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

+				PreprocessorDefinitions="_CONSOLE;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -877,39 +878,39 @@
 			<Tool

 				Name="VCLinkerTool"

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

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


 			/>

 			<Tool

 				Name="VCALinkTool"

 			/>

 			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

 				Name="VCXDCMakeTool"

 			/>

 			<Tool

 				Name="VCBscMakeTool"

 			/>

 			<Tool

-				Name="VCCodeSignTool"

+				Name="VCFxCopTool"

 			/>

 			<Tool

-				Name="VCPostBuildEventTool"

+				Name="VCAppVerifierTool"

 			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

+			<Tool

+				Name="VCWebDeploymentTool"

 			/>

-			<DebuggerTool

+			<Tool

+				Name="VCPostBuildEventTool"

 			/>

 		</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|Pocket PC 2003 (ARMV4)"

 			ConfigurationType="1"

+			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"

@@ -944,7 +945,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

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


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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -971,12 +972,12 @@
 			/>

 		</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"


+			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"

 			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -995,7 +996,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_CONSOLE;"


+				ExecutionBucket="7"

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

 				PrecompiledHeaderFile=""

 			/>

@@ -1011,39 +1012,39 @@
 			<Tool

 				Name="VCLinkerTool"

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

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

 			/>

 			<Tool

 				Name="VCALinkTool"

 			/>

 			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

 				Name="VCXDCMakeTool"

 			/>

 			<Tool

 				Name="VCBscMakeTool"

 			/>

 			<Tool

-				Name="VCFxCopTool"

+				Name="VCCodeSignTool"

 			/>

 			<Tool

-				Name="VCAppVerifierTool"

+				Name="VCPostBuildEventTool"

 			/>

-			<Tool

-				Name="VCWebDeploymentTool"

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

 			/>

-			<Tool

-				Name="VCPostBuildEventTool"

+			<DebuggerTool

 			/>

 		</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="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"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1062,8 +1063,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

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

+				PreprocessorDefinitions="_CONSOLE;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1077,40 +1078,40 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

 			/>

 			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

 				Name="VCXDCMakeTool"

 			/>

 			<Tool

 				Name="VCBscMakeTool"

 			/>

 			<Tool

-				Name="VCCodeSignTool"

+				Name="VCFxCopTool"

 			/>

 			<Tool

-				Name="VCPostBuildEventTool"

+				Name="VCAppVerifierTool"

 			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

+			<Tool

+				Name="VCWebDeploymentTool"

 			/>

-			<DebuggerTool

+			<Tool

+				Name="VCPostBuildEventTool"

 			/>

 		</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="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"

 			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -1144,8 +1145,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1172,12 +1173,12 @@
 			/>

 		</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-Static|Smartphone 2003 (ARMV4)"

 			ConfigurationType="1"

+			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"

@@ -1211,8 +1212,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1239,10 +1240,10 @@
 			/>

 		</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="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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -1278,8 +1279,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1306,10 +1307,10 @@
 			/>

 		</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|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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -1345,8 +1346,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1373,10 +1374,10 @@
 			/>

 		</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|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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -1412,8 +1413,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1440,10 +1441,10 @@
 			/>

 		</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"


+			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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -1464,7 +1465,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_CONSOLE;"


+				ExecutionBucket="7"

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

 				PrecompiledHeaderFile=""

 			/>

@@ -1480,37 +1481,37 @@
 			<Tool

 				Name="VCLinkerTool"

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

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

 			/>

 			<Tool

 				Name="VCALinkTool"

 			/>

 			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

 				Name="VCXDCMakeTool"

 			/>

 			<Tool

 				Name="VCBscMakeTool"

 			/>

 			<Tool

-				Name="VCFxCopTool"

+				Name="VCCodeSignTool"

 			/>

 			<Tool

-				Name="VCAppVerifierTool"

+				Name="VCPostBuildEventTool"

 			/>

-			<Tool

-				Name="VCWebDeploymentTool"

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

 			/>

-			<Tool

-				Name="VCPostBuildEventTool"

+			<DebuggerTool

 			/>

 		</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="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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -1546,8 +1547,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1574,10 +1575,10 @@
 			/>

 		</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="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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -1613,8 +1614,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1641,10 +1642,10 @@
 			/>

 		</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="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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -1680,8 +1681,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1708,10 +1709,10 @@
 			/>

 		</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|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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -1747,8 +1748,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1775,10 +1776,10 @@
 			/>

 		</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="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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -1814,8 +1815,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1842,10 +1843,10 @@
 			/>

 		</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="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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -1881,8 +1882,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1909,10 +1910,10 @@
 			/>

 		</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"


+			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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

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

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_CONSOLE;"


+				ExecutionBucket="7"

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

 				PrecompiledHeaderFile=""

 			/>

@@ -1949,37 +1950,37 @@
 			<Tool

 				Name="VCLinkerTool"

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

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

 			/>

 			<Tool

 				Name="VCALinkTool"

 			/>

 			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

 				Name="VCXDCMakeTool"

 			/>

 			<Tool

 				Name="VCBscMakeTool"

 			/>

 			<Tool

-				Name="VCFxCopTool"

+				Name="VCCodeSignTool"

 			/>

 			<Tool

-				Name="VCAppVerifierTool"

+				Name="VCPostBuildEventTool"

 			/>

-			<Tool

-				Name="VCWebDeploymentTool"

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

 			/>

-			<Tool

-				Name="VCPostBuildEventTool"

+			<DebuggerTool

 			/>

 		</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-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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -2016,7 +2017,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

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


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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2043,10 +2044,10 @@
 			/>

 		</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="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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -2082,8 +2083,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2110,10 +2111,10 @@
 			/>

 		</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="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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -2149,8 +2150,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2177,10 +2178,10 @@
 			/>

 		</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="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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -2216,8 +2217,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2244,10 +2245,10 @@
 			/>

 		</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="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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -2283,8 +2284,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2311,10 +2312,10 @@
 			/>

 		</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="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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -2351,7 +2352,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

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


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

 			/>

 			<Tool

 				Name="VCALinkTool"

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

 		</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"


+			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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -2402,7 +2403,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_CONSOLE;"


+				ExecutionBucket="7"

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

 				PrecompiledHeaderFile=""

 			/>

@@ -2417,38 +2418,38 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

+				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

 			/>

 			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

 				Name="VCXDCMakeTool"

 			/>

 			<Tool

 				Name="VCBscMakeTool"

 			/>

 			<Tool

-				Name="VCFxCopTool"

+				Name="VCCodeSignTool"

 			/>

 			<Tool

-				Name="VCAppVerifierTool"

+				Name="VCPostBuildEventTool"

 			/>

-			<Tool

-				Name="VCWebDeploymentTool"

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

 			/>

-			<Tool

-				Name="VCPostBuildEventTool"

+			<DebuggerTool

 			/>

 		</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="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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -2484,8 +2485,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2512,10 +2513,10 @@
 			/>

 		</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="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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -2551,8 +2552,8 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="Iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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


+				AdditionalDependencies="Iphlpapi.lib  dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib gdi32.lib advapi32.lib"

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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2579,10 +2580,10 @@
 			/>

 		</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="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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -2619,7 +2620,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

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


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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2646,10 +2647,10 @@
 			/>

 		</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="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"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -2686,7 +2687,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

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


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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2714,9 +2715,9 @@
 		</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"


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

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -2753,7 +2754,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

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


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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2781,9 +2782,9 @@
 		</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"


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

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

 			ConfigurationType="1"

 			UseOfMFC="0"

 			>

@@ -2820,7 +2821,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

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


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

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2867,7 +2868,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -2876,7 +2877,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -2885,7 +2886,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

+					Name="Debug|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -2894,7 +2895,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -2903,7 +2904,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -2912,7 +2913,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

+					Name="Debug-Static|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -2921,7 +2922,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32"

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -2930,7 +2931,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -2939,7 +2940,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

+					Name="Release-Dynamic|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -2948,7 +2949,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -2957,7 +2958,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -2966,7 +2967,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

+					Name="Debug-Dynamic|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -2975,7 +2976,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -2984,7 +2985,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Static|Win32"

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -2993,7 +2994,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

+					Name="Release-Static|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3002,7 +3003,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3011,7 +3012,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3020,7 +3021,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3029,7 +3030,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3038,7 +3039,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3047,7 +3048,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Dynamic|Win32"

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3056,7 +3057,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3065,7 +3066,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3074,7 +3075,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3083,7 +3084,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3092,7 +3093,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3101,7 +3102,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3110,7 +3111,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Dynamic|Win32"

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3119,7 +3120,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3128,7 +3129,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3137,7 +3138,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3146,7 +3147,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3155,7 +3156,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3164,7 +3165,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3173,7 +3174,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Static|Win32"

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3182,7 +3183,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3191,7 +3192,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3200,7 +3201,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3209,7 +3210,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3249,7 +3250,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3258,7 +3259,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3267,7 +3268,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

+					Name="Debug|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3276,7 +3277,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3285,7 +3286,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3294,7 +3295,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

+					Name="Debug-Static|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3303,7 +3304,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug|Win32"

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3312,7 +3313,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3321,7 +3322,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

+					Name="Release-Dynamic|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3330,7 +3331,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3339,7 +3340,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3348,7 +3349,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

+					Name="Debug-Dynamic|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3357,7 +3358,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3366,7 +3367,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Static|Win32"

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3375,7 +3376,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

+					Name="Release-Static|Win32"

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3384,7 +3385,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3393,7 +3394,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3402,7 +3403,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3411,7 +3412,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3420,7 +3421,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3429,7 +3430,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Dynamic|Win32"

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3438,7 +3439,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3447,7 +3448,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3456,7 +3457,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3465,7 +3466,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3474,7 +3475,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3483,7 +3484,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3492,7 +3493,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Debug-Dynamic|Win32"

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3501,7 +3502,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3510,7 +3511,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3519,7 +3520,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3528,7 +3529,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3537,7 +3538,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3546,7 +3547,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3555,7 +3556,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

-					Name="Release-Static|Win32"

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3564,7 +3565,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3573,7 +3574,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3582,7 +3583,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

@@ -3591,7 +3592,7 @@
 					/>

 				</FileConfiguration>

 				<FileConfiguration

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

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

 					>

 					<Tool

 						Name="VCCLCompilerTool"

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

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

-# ** DO NOT EDIT **

-

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

-

-CFG=pjsystest - 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 "pjsystest.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 "pjsystest.mak" CFG="pjsystest - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

-!MESSAGE "pjsystest - 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)" == "pjsystest - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

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

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

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

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

-# PROP Intermediate_Dir ".\output\pjsystest-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 /W4 /GX /Zi /O2 /I "../../pjsip/include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjmedia/include" /I "../../pjnath/include" /D "NDEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /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

-LINK32=link.exe

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

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

-# SUBTRACT LINK32 /pdb:none

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

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

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

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

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

-# PROP Intermediate_Dir ".\output\pjsystest-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 /W4 /Gm /GX /ZI /Od /I "../../pjsip/include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjmedia/include" /I "../../pjnath/include" /D "_DEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /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

-LINK32=link.exe

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

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

-

-!ENDIF 

-

-# Begin Target

-

-# Name "pjsystest - Win32 Release"

-# Name "pjsystest - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=..\src\pjsystest\main_console.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjsystest\main_wm.c

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjsystest\systest.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

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

-# Begin Source File

-

-SOURCE=..\src\pjsystest\gui.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\pjsystest\systest.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

-# End Target

-# End Project

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

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=py_pjsua - 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 "py_pjsua.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 "py_pjsua.mak" CFG="py_pjsua - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "py_pjsua - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "py_pjsua - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

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

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

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PY_PJSUA_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\pjlib\include" /I "..\..\pjlib-util\include" /I "..\..\pjmedia\include" /I "..\..\pjsip\include" /I "../../pjnath/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PY_PJSUA_EXPORTS" /FR /YX /FD /c

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

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

-# ADD RSC /l 0x421 /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 /nologo /dll /machine:I386

-# ADD LINK32 python24.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 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib iphlpapi.lib /nologo /dll /map /machine:I386 /nodefaultlib:"libcmt.lib" /out:"..\lib\py_pjsua.pyd" /libpath:"../../pjlib/lib" /libpath:"../../pjlib-util/lib" /libpath:"../../pjmedia/lib" /libpath:"../../pjsip/lib"

-# SUBTRACT LINK32 /nodefaultlib

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

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

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

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

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

-# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "..\..\pjlib\include" /I "..\..\pjlib-util\include" /I "..\..\pjmedia\include" /I "..\..\pjsip\include" /I "../../pjnath/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PY_PJSUA_EXPORTS" /FR /YX /FD /GZ /c

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

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

-# ADD RSC /l 0x421 /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 /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 python24_d.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 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib iphlpapi.lib /nologo /dll /debug /machine:I386 /out:"..\lib\py_pjsua_d.pyd" /pdbtype:sept /libpath:"../../pjlib/lib" /libpath:"../../pjlib-util/lib" /libpath:"../../pjmedia/lib" /libpath:"../../pjsip/lib" /libpath:"F:\incoming\projects\divusi\Python-2.4\Python-2.4\PCbuild" /libpath:"F:\incoming\projects\divusi\Python-2.4\Python-2.4\PC\VC6"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "py_pjsua - Win32 Release"

-# Name "py_pjsua - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=..\src\py_pjsua\pjsua.py

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\py_pjsua\pjsua_app.py

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\py_pjsua\py_pjsua.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\py_pjsua\py_pjsua.def

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

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

-# Begin Source File

-

-SOURCE=..\src\py_pjsua\py_pjsua.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

-# End Target

-# End Project

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

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=python_pjsua - 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 "python_pjsua.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 "python_pjsua.mak" CFG="python_pjsua - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "python_pjsua - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "python_pjsua - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

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

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

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PY_PJSUA_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\pjlib\include" /I "..\..\pjlib-util\include" /I "..\..\pjmedia\include" /I "..\..\pjsip\include" /I "../../pjnath/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PY_PJSUA_EXPORTS" /FR /YX /FD /c

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

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

-# ADD RSC /l 0x421 /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 /nologo /dll /machine:I386

-# ADD LINK32 python24.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 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib iphlpapi.lib /nologo /dll /map /machine:I386 /nodefaultlib:"libcmt.lib" /out:"..\lib\_pjsua.pyd" /libpath:"../../pjlib/lib" /libpath:"../../pjlib-util/lib" /libpath:"../../pjmedia/lib" /libpath:"../../pjsip/lib"

-# SUBTRACT LINK32 /nodefaultlib

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

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

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

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

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

-# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "..\..\pjlib\include" /I "..\..\pjlib-util\include" /I "..\..\pjmedia\include" /I "..\..\pjsip\include" /I "../../pjnath/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PY_PJSUA_EXPORTS" /FR /YX /FD /GZ /c

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

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

-# ADD RSC /l 0x421 /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 /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 python24_d.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 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib iphlpapi.lib /nologo /dll /debug /machine:I386 /out:"..\lib\_pjsua_d.pyd" /pdbtype:sept /libpath:"../../pjlib/lib" /libpath:"../../pjlib-util/lib" /libpath:"../../pjmedia/lib" /libpath:"../../pjsip/lib" /libpath:"F:\incoming\projects\divusi\Python-2.4\Python-2.4\PCbuild" /libpath:"F:\incoming\projects\divusi\Python-2.4\Python-2.4\PC\VC6"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "python_pjsua - Win32 Release"

-# Name "python_pjsua - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=..\src\python\_pjsua.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\python\_pjsua.def

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

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

-# Begin Source File

-

-SOURCE=..\src\python\_pjsua.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

-# End Target

-# End Project

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

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

-# ** DO NOT EDIT **

-

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

-

-CFG=sample_debug - 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 "sample_debug.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 "sample_debug.mak" CFG="sample_debug - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

-!MESSAGE "sample_debug - 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)" == "sample_debug - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "./output/samples-i386-win32-vc6-release"

-# PROP BASE Intermediate_Dir "./output/samples-i386-win32-vc6-release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "./output/samples-i386-win32-vc6-release"

-# PROP Intermediate_Dir "./output/samples-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 /Zi /O2 /I "../../pjsip/include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjmedia/include" /I "../../pjnath/include" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /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

-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 Iphlpapi.lib ole32.lib user32.lib 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 /map /debug /machine:I386 /out:"../bin/samples/sampledebug_vc6.exe" /fixed:no

-# SUBTRACT LINK32 /pdb:none

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "./output/samples-i386-win32-vc6-debug"

-# PROP BASE Intermediate_Dir "./output/samples-i386-win32-vc6-debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "./output/samples-i386-win32-vc6-debug"

-# PROP Intermediate_Dir "./output/samples-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 /W4 /Gm /GX /ZI /Od /I "../../pjsip/include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjmedia/include" /I "../../pjnath/include" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_DEBUG" /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 Iphlpapi.lib ole32.lib user32.lib 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 /map /debug /machine:I386 /out:"../bin/samples/sampledebug_vc6d.exe" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "sample_debug - Win32 Release"

-# Name "sample_debug - Win32 Debug"

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=..\src\samples\debug.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/pjsip-apps/build/sample_debug.vcproj b/pjsip-apps/build/sample_debug.vcproj
index 0df2cd13..f9e77266 100644
--- a/pjsip-apps/build/sample_debug.vcproj
+++ b/pjsip-apps/build/sample_debug.vcproj
@@ -34,11 +34,11 @@
 	<Configurations>

 		<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="1"

+			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"

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

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_CONSOLE;"


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

+				PreprocessorDefinitions="_CONSOLE;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -73,7 +73,8 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"

+				IgnoreDefaultLibraryNames="MSVCRT.LIB"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -102,11 +103,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"


 			ConfigurationType="1"

+			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"

@@ -141,7 +142,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -169,11 +170,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"


 			ConfigurationType="1"

+			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"

@@ -208,7 +209,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -236,11 +237,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"


 			ConfigurationType="1"

+			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"

@@ -275,7 +276,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -303,11 +304,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"


 			ConfigurationType="1"

+			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"

@@ -342,7 +343,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -370,11 +371,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"


 			ConfigurationType="1"

+			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"

@@ -409,7 +410,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -437,11 +438,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"


 			ConfigurationType="1"

+			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"

@@ -476,7 +477,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -504,11 +505,11 @@
 		</Configuration>

 		<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="1"

+			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"

@@ -527,8 +528,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_CONSOLE;"


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

+				PreprocessorDefinitions="_CONSOLE;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -543,7 +544,8 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"

+				IgnoreDefaultLibraryNames=""

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -572,11 +574,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"


 			ConfigurationType="1"

+			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"

@@ -611,7 +613,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -639,11 +641,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"


 			ConfigurationType="1"

+			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"

@@ -678,7 +680,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -706,11 +708,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"


 			ConfigurationType="1"

+			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"

@@ -745,7 +747,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -773,11 +775,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"


 			ConfigurationType="1"

+			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"

@@ -812,7 +814,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -840,11 +842,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"


 			ConfigurationType="1"

+			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"

@@ -879,7 +881,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -907,11 +909,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"


 			ConfigurationType="1"

+			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"

@@ -946,7 +948,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -974,11 +976,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="1"

+			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"

@@ -997,8 +999,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_CONSOLE;"


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

+				PreprocessorDefinitions="_CONSOLE;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1013,7 +1015,8 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"

+				IgnoreDefaultLibraryNames="MSVCRT.LIB"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1042,11 +1045,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"


 			ConfigurationType="1"

+			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"

@@ -1081,7 +1084,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1109,11 +1112,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"


 			ConfigurationType="1"

+			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"

@@ -1148,7 +1151,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1176,11 +1179,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"


 			ConfigurationType="1"

+			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"

@@ -1215,7 +1218,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1243,11 +1246,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"


 			ConfigurationType="1"

+			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"

@@ -1282,7 +1285,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1310,11 +1313,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"


 			ConfigurationType="1"

+			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"

@@ -1349,7 +1352,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1377,11 +1380,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"


 			ConfigurationType="1"

+			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"

@@ -1416,7 +1419,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1444,11 +1447,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="1"

+			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"

@@ -1467,8 +1470,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_CONSOLE;"


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

+				PreprocessorDefinitions="_CONSOLE;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1483,7 +1486,8 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"

+				IgnoreDefaultLibraryNames=""

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1512,11 +1516,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"


 			ConfigurationType="1"

+			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"

@@ -1551,7 +1555,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1579,11 +1583,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"


 			ConfigurationType="1"

+			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"

@@ -1618,7 +1622,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1646,11 +1650,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"


 			ConfigurationType="1"

+			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"

@@ -1685,7 +1689,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1713,11 +1717,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"


 			ConfigurationType="1"

+			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"

@@ -1752,7 +1756,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1780,11 +1784,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"


 			ConfigurationType="1"

+			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"

@@ -1819,7 +1823,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1847,11 +1851,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"


 			ConfigurationType="1"

+			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"

@@ -1886,7 +1890,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1914,11 +1918,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="1"

+			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"

@@ -1937,8 +1941,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_CONSOLE;"


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

+				PreprocessorDefinitions="_CONSOLE;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -1953,7 +1957,8 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"

+				IgnoreDefaultLibraryNames="MSVCRT.LIB"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1982,11 +1987,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"


 			ConfigurationType="1"

+			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"

@@ -2021,7 +2026,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2049,11 +2054,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"


 			ConfigurationType="1"

+			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"

@@ -2088,7 +2093,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2116,11 +2121,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"


 			ConfigurationType="1"

+			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"

@@ -2155,7 +2160,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2183,11 +2188,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"


 			ConfigurationType="1"

+			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"

@@ -2222,7 +2227,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2250,11 +2255,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"


 			ConfigurationType="1"

+			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"

@@ -2289,7 +2294,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2317,11 +2322,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"


 			ConfigurationType="1"

+			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"

@@ -2356,7 +2361,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2384,11 +2389,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="1"

+			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"

@@ -2407,8 +2412,8 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="_CONSOLE;"


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

+				PreprocessorDefinitions="_CONSOLE;"

 				PrecompiledHeaderFile=""

 			/>

 			<Tool

@@ -2423,7 +2428,8 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"

+				IgnoreDefaultLibraryNames="MSVCRT.LIB"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2452,11 +2458,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"


 			ConfigurationType="1"

+			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"

@@ -2491,7 +2497,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2519,11 +2525,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"


 			ConfigurationType="1"

+			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"

@@ -2558,7 +2564,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2586,11 +2592,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"


 			ConfigurationType="1"

+			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"

@@ -2625,7 +2631,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2653,11 +2659,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"


 			ConfigurationType="1"

+			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"

@@ -2692,7 +2698,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2720,11 +2726,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"


 			ConfigurationType="1"

+			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"

@@ -2759,7 +2765,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2787,11 +2793,11 @@
 		</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="1"

+			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"

@@ -2826,7 +2832,7 @@
 			<Tool

 				Name="VCLinkerTool"

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

-				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"


+				OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"

 			/>

 			<Tool

 				Name="VCALinkTool"

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

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

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) External Target" 0x0106

-

-CFG=samples - 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 "samples.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 "samples.mak" CFG="samples - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "samples - Win32 Release" (based on "Win32 (x86) External Target")

-!MESSAGE "samples - Win32 Debug" (based on "Win32 (x86) External Target")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "./output/samples-i386-win32-vc6-release"

-# PROP BASE Intermediate_Dir "./output/samples-i386-win32-vc6-release"

-# PROP BASE Cmd_Line "NMAKE /f samples.mak"

-# PROP BASE Rebuild_Opt "/a"

-# PROP BASE Target_File "samples.exe"

-# PROP BASE Bsc_Name "samples.bsc"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "./output/samples-i386-win32-vc6-release"

-# PROP Intermediate_Dir "./output/samples-i386-win32-vc6-release"

-# PROP Cmd_Line "nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=6"

-# PROP Rebuild_Opt "/a"

-# PROP Target_File "All samples"

-# PROP Bsc_Name ""

-# PROP Target_Dir ""

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "./output/samples-i386-win32-vc6-debug"

-# PROP BASE Intermediate_Dir "./output/samples-i386-win32-vc6-debug"

-# PROP BASE Cmd_Line "NMAKE /f samples.mak"

-# PROP BASE Rebuild_Opt "/a"

-# PROP BASE Target_File "samples.exe"

-# PROP BASE Bsc_Name "samples.bsc"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "./output/samples-i386-win32-vc6-debug"

-# PROP Intermediate_Dir "./output/samples-i386-win32-vc6-debug"

-# PROP Cmd_Line "nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=6"

-# PROP Rebuild_Opt "/a"

-# PROP Target_File "All samples"

-# PROP Bsc_Name ""

-# PROP Target_Dir ""

-

-!ENDIF 

-

-# Begin Target

-

-# Name "samples - Win32 Release"

-# Name "samples - Win32 Debug"

-

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

-

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

-

-!ENDIF 

-

-# Begin Group "Source Files"

-

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

-# Begin Source File

-

-SOURCE=..\src\samples\aectest.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\auddemo.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\confbench.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\confsample.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\encdec.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\footprint.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\httpdemo.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\icedemo.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\invtester.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\jbsim.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\latency.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\level.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\mix.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\pcaputil.c

-# End Source File

-# Begin Source File

-

-SOURCE="..\src\samples\pjsip-perf.c"

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\playfile.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\playsine.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\recfile.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\resampleplay.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\simple_pjsua.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\simpleua.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\siprtp.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\siprtp_report.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\sipstateless.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\sndinfo.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\sndtest.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\stateful_proxy.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\stateless_proxy.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\stereotest.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\streamutil.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\strerror.c

-# End Source File

-# Begin Source File

-

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

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

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

-# Begin Source File

-

-SOURCE=..\src\samples\proxy.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\src\samples\util.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=".\Samples-vc.mak"

-# End Source File

-# Begin Source File

-

-SOURCE=.\Samples.mak

-# End Source File

-# End Target

-# End Project

diff --git a/pjsip-apps/build/samples.vcproj b/pjsip-apps/build/samples.vcproj
index 09767799..f7825e0a 100644
--- a/pjsip-apps/build/samples.vcproj
+++ b/pjsip-apps/build/samples.vcproj
@@ -136,32 +136,8 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\output\$(ProjectName)-i386-$(PlatformName)-vs8-$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

-			ConfigurationType="0"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="false"

-			BuildLogFile=""

-			>

-			<Tool

-				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 clean"

-				Output="All samples"

-				PreprocessorDefinitions=""

-				IncludeSearchPath=""

-				ForcedIncludes=""

-				AssemblySearchPath=""

-				ForcedUsingAssemblies=""

-				CompileAsManaged=""

-			/>

-		</Configuration>

-		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm2003ppc-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm6std-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -171,9 +147,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -199,8 +175,8 @@
 			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm2003sp-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm6pro-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -210,9 +186,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -238,8 +214,8 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Static|Win32"

-			OutputDirectory=".\output\$(ProjectName)-i386-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm5ppc-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -249,9 +225,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -260,10 +236,25 @@
 				ForcedUsingAssemblies=""

 				CompileAsManaged=""

 			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				ExecutionBucket="7"

+			/>

+			<Tool

+				Name="VCCodeSignTool"

+			/>

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

+			/>

+			<DebuggerTool

+			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm2003ppc-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm5sp-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -273,9 +264,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -301,8 +292,8 @@
 			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm2003sp-$(PlatformName)-vs8-$(ConfigurationName)"

+			Name="Debug|Win32"

+			OutputDirectory=".\output\$(ProjectName)-i386-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -312,9 +303,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -323,25 +314,10 @@
 				ForcedUsingAssemblies=""

 				CompileAsManaged=""

 			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Dynamic|Win32"

-			OutputDirectory=".\output\$(ProjectName)-i386-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm2003ppc-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -351,9 +327,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -362,10 +338,25 @@
 				ForcedUsingAssemblies=""

 				CompileAsManaged=""

 			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				ExecutionBucket="7"

+			/>

+			<Tool

+				Name="VCCodeSignTool"

+			/>

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

+			/>

+			<DebuggerTool

+			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm2003ppc-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm2003sp-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -375,9 +366,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -403,8 +394,8 @@
 			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm2003sp-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm6std-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -414,9 +405,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -442,8 +433,8 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug-Dynamic|Win32"

-			OutputDirectory=".\output\$(ProjectName)-i386-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm6pro-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -453,9 +444,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -464,10 +455,25 @@
 				ForcedUsingAssemblies=""

 				CompileAsManaged=""

 			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				ExecutionBucket="7"

+			/>

+			<Tool

+				Name="VCCodeSignTool"

+			/>

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

+			/>

+			<DebuggerTool

+			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm2003ppc-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm5ppc-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -477,9 +483,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -505,8 +511,8 @@
 			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm2003sp-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm5sp-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -516,9 +522,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -544,7 +550,7 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release-Static|Win32"

+			Name="Debug-Static|Win32"

 			OutputDirectory=".\output\$(ProjectName)-i386-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

@@ -555,9 +561,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

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

 		</Configuration>

 		<Configuration

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

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

 			OutputDirectory=".\output\$(ProjectName)-wm2003ppc-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

@@ -579,9 +585,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -607,7 +613,7 @@
 			/>

 		</Configuration>

 		<Configuration

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

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

 			OutputDirectory=".\output\$(ProjectName)-wm2003sp-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

@@ -618,9 +624,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -646,7 +652,7 @@
 			/>

 		</Configuration>

 		<Configuration

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

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

 			OutputDirectory=".\output\$(ProjectName)-wm6std-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

@@ -657,9 +663,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -685,7 +691,7 @@
 			/>

 		</Configuration>

 		<Configuration

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

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

 			OutputDirectory=".\output\$(ProjectName)-wm6pro-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

@@ -696,9 +702,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -724,8 +730,8 @@
 			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm6std-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm5ppc-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -735,9 +741,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -763,8 +769,8 @@
 			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm6pro-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm5sp-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -774,9 +780,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -802,8 +808,8 @@
 			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm6std-$(PlatformName)-vs8-$(ConfigurationName)"

+			Name="Release-Dynamic|Win32"

+			OutputDirectory=".\output\$(ProjectName)-i386-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -813,9 +819,33 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 clean"

+				Output="All samples"

+				PreprocessorDefinitions=""

+				IncludeSearchPath=""

+				ForcedIncludes=""

+				AssemblySearchPath=""

+				ForcedUsingAssemblies=""

+				CompileAsManaged=""

+			/>

+		</Configuration>

+		<Configuration

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

+			OutputDirectory=".\output\$(ProjectName)-wm2003ppc-$(PlatformName)-vs8-$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)"

+			ConfigurationType="0"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			BuildLogFile=""

+			>

+			<Tool

+				Name="VCNMakeTool"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -841,8 +871,8 @@
 			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm6pro-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm2003sp-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -852,9 +882,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -958,8 +988,8 @@
 			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm6std-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm5ppc-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -969,9 +999,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -997,8 +1027,8 @@
 			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm6pro-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm5sp-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -1008,9 +1038,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -1036,8 +1066,8 @@
 			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm6std-$(PlatformName)-vs8-$(ConfigurationName)"

+			Name="Debug-Dynamic|Win32"

+			OutputDirectory=".\output\$(ProjectName)-i386-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -1047,9 +1077,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -1058,25 +1088,10 @@
 				ForcedUsingAssemblies=""

 				CompileAsManaged=""

 			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm6pro-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm2003ppc-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -1086,9 +1101,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -1114,8 +1129,8 @@
 			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm5ppc-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm2003sp-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -1125,9 +1140,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -1153,8 +1168,8 @@
 			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm5sp-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm6std-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -1164,9 +1179,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -1192,8 +1207,8 @@
 			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm5ppc-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm6pro-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -1203,9 +1218,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -1231,8 +1246,8 @@
 			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm5sp-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm5ppc-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -1242,9 +1257,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -1270,8 +1285,8 @@
 			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm5ppc-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm5sp-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -1281,9 +1296,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -1309,8 +1324,8 @@
 			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm5sp-$(PlatformName)-vs8-$(ConfigurationName)"

+			Name="Release-Static|Win32"

+			OutputDirectory=".\output\$(ProjectName)-i386-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -1320,9 +1335,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -1331,25 +1346,10 @@
 				ForcedUsingAssemblies=""

 				CompileAsManaged=""

 			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm5ppc-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm2003ppc-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -1359,9 +1359,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -1387,8 +1387,8 @@
 			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm5sp-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm2003sp-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -1398,9 +1398,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -1426,8 +1426,8 @@
 			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm5ppc-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm6std-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -1437,9 +1437,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -1465,8 +1465,8 @@
 			/>

 		</Configuration>

 		<Configuration

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

-			OutputDirectory=".\output\$(ProjectName)-wm5sp-$(PlatformName)-vs8-$(ConfigurationName)"

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

+			OutputDirectory=".\output\$(ProjectName)-wm6pro-$(PlatformName)-vs8-$(ConfigurationName)"

 			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="0"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

@@ -1476,9 +1476,9 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8"

-				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 /a"

-				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=8 clean"

+				BuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8"

+				ReBuildCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 /a"

+				CleanCommandLine="nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=8 clean"

 				Output="All samples"

 				PreprocessorDefinitions=""

 				IncludeSearchPath=""

@@ -1598,6 +1598,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\src\samples\aviplay.c"

+				>

+			</File>

+			<File

 				RelativePath="..\src\samples\confbench.c"

 				>

 			</File>

@@ -1709,6 +1713,10 @@
 				RelativePath="..\src\samples\tonegen.c"

 				>

 			</File>

+			<File

+				RelativePath="..\src\samples\vid_streamutil.c"

+				>

+			</File>

 		</Filter>

 		<Filter

 			Name="Header Files"