Ticket #706: Merged branch vs-reorg into trunk:

 - Currently supported platforms are Win32 & WM6 std/pro.
 - Renamed project test_pjsip with pjsip_test, also source directory 'test-pjsip' to 'test'.




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

1 files changed, 565 insertions, 266 deletions

diff --git a/pjnath/build/pjnath_test.vcproj b/pjnath/build/pjnath_test.vcproj
index f6831bc8..a9452573 100644
--- a/pjnath/build/pjnath_test.vcproj
+++ b/pjnath/build/pjnath_test.vcproj
@@ -13,16 +13,17 @@
 		<Platform

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

 		/>

+		<Platform

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

+		/>

 	</Platforms>

 	<ToolFiles>

 	</ToolFiles>

 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory="./output/pjnath-test-i386-win32-vc8-debug"

-			IntermediateDirectory="./output/pjnath-test-i386-win32-vc8-debug"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

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

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -41,33 +42,18 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName="./output/pjnath-test-i386-win32-vc8-debug/pjnath_test.tlb"

-				HeaderFileName=""

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

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

-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;PJ_WIN32=1;PJ_M_I386=1"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				PrecompiledHeaderFile="./output/pjnath-test-i386-win32-vc8-debug/pjnath_test.pch"

-				AssemblerListingLocation="./output/pjnath-test-i386-win32-vc8-debug/"

-				ObjectFile="./output/pjnath-test-i386-win32-vc8-debug/"

-				ProgramDataBaseFileName="./output/pjnath-test-i386-win32-vc8-debug/"

-				BrowseInformation="1"

-				WarningLevel="4"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="4"

+				PreprocessorDefinitions="_CONSOLE;"

+				PrecompiledHeaderFile=""

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

@@ -75,13 +61,9 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="netapi32.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib"

-				OutputFile="../bin/pjnath-test-i386-win32-vc8-debug.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="./output/pjnath-test-i386-win32-vc8-debug/pjnath-test-i386-win32-vc8-debug.pdb"

-				SubSystem="1"

-				TargetMachine="1"

+				OutputFile="..\bin\pjnath-test-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName).exe"

+

+

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -94,8 +76,6 @@
 			/>

 			<Tool

 				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile="./output/pjnath-test-i386-win32-vc8-debug/pjnath_test.bsc"

 			/>

 			<Tool

 				Name="VCFxCopTool"

@@ -112,9 +92,9 @@
 		</Configuration>

 		<Configuration

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

-			OutputDirectory="output\$(ProjectName)-$(PlatformName)-$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="1"

 			>

 			<Tool

@@ -135,16 +115,9 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				ExecutionBucket="7"

-				Optimization="0"

-				FavorSizeOrSpeed="0"

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

-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;$(ARCHFAM);$(_ARCHFAM_);SMARTPHONE2003_UI_MODEL;SMARTPHONE2003_UI_MODEL"

-				ExceptionHandling="0"

-				RuntimeLibrary="1"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-				CompileAs="0"

-				CompileForArchitecture="0"

+				PreprocessorDefinitions=""

+				PrecompiledHeaderFile=""

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -157,12 +130,10 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalOptions=""

 				AdditionalDependencies="ws2.lib"

-				GenerateDebugInformation="true"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="0"

+				OutputFile="..\bin\pjnath-test-$(TargetCPU)-wm6std-vs$(VSVer)-$(ConfigurationName).exe"

+

+

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -190,10 +161,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory="./output/pjnath-test-i386-win32-vc8-release"

-			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

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

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -212,33 +181,18 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName="./output/pjnath-test-i386-win32-vc8-release/pjnath_test.tlb"

-				HeaderFileName=""

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

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

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;PJ_WIN32=1;PJ_M_I386=1"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile="./output/pjnath-test-i386-win32-vc8-release/pjnath_test.pch"

-				AssemblerListingLocation="./output/pjnath-test-i386-win32-vc8-release/"

-				ObjectFile="./output/pjnath-test-i386-win32-vc8-release/"

-				ProgramDataBaseFileName="./output/pjnath-test-i386-win32-vc8-release/"

-				BrowseInformation="1"

-				WarningLevel="4"

-				SuppressStartupBanner="true"

+				PreprocessorDefinitions="_CONSOLE;"

+				PrecompiledHeaderFile=""

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

@@ -246,12 +200,9 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib "

-				OutputFile="../bin/pjnath-test-i386-win32-vc8-release.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile="./output/pjnath-test-i386-win32-vc8-release/pjnath-test-i386-win32-vc8-release.pdb"

-				SubSystem="1"

-				TargetMachine="1"

+				OutputFile="..\bin\pjnath-test-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName).exe"

+

+

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -264,8 +215,6 @@
 			/>

 			<Tool

 				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile="./output/pjnath-test-i386-win32-vc8-release/pjnath_test.bsc"

 			/>

 			<Tool

 				Name="VCFxCopTool"

@@ -282,9 +231,9 @@
 		</Configuration>

 		<Configuration

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

-			OutputDirectory="output\$(ProjectName)-$(PlatformName)-$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

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

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="1"

 			>

 			<Tool

@@ -305,16 +254,9 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				ExecutionBucket="7"

-				Optimization="2"

-				FavorSizeOrSpeed="2"

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

-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_);SMARTPHONE2003_UI_MODEL;SMARTPHONE2003_UI_MODEL"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				WarningLevel="3"

-				DebugInformationFormat="0"

-				CompileAs="0"

-				CompileForArchitecture="0"

+				PreprocessorDefinitions=""

+				PrecompiledHeaderFile=""

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -327,11 +269,10 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalOptions=""

 				AdditionalDependencies="ws2.lib"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="0"

+				OutputFile="..\bin\pjnath-test-$(TargetCPU)-wm6std-vs$(VSVer)-$(ConfigurationName).exe"

+

+

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -359,10 +300,8 @@
 		</Configuration>

 		<Configuration

 			Name="Debug-Static|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

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

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -381,33 +320,18 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName="./output/pjnath-test-i386-win32-vc8-debug/pjnath_test.tlb"

-				HeaderFileName=""

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

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

-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;PJ_WIN32=1;PJ_M_I386=1"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				PrecompiledHeaderFile="./output/pjnath-test-i386-win32-vc8-debug/pjnath_test.pch"

-				AssemblerListingLocation="./output/pjnath-test-i386-win32-vc8-debug/"

-				ObjectFile="./output/pjnath-test-i386-win32-vc8-debug/"

-				ProgramDataBaseFileName="./output/pjnath-test-i386-win32-vc8-debug/"

-				BrowseInformation="1"

-				WarningLevel="4"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="4"

+				PreprocessorDefinitions="_CONSOLE;"

+				PrecompiledHeaderFile=""

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

@@ -415,13 +339,9 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="netapi32.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib"

-				OutputFile="../bin/pjnath-test-i386-win32-vc8-debug.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="./output/pjnath-test-i386-win32-vc8-debug/pjnath-test-i386-win32-vc8-debug.pdb"

-				SubSystem="1"

-				TargetMachine="1"

+				OutputFile="..\bin\pjnath-test-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName).exe"

+

+

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -434,8 +354,6 @@
 			/>

 			<Tool

 				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile="./output/pjnath-test-i386-win32-vc8-debug/pjnath_test.bsc"

 			/>

 			<Tool

 				Name="VCFxCopTool"

@@ -452,9 +370,9 @@
 		</Configuration>

 		<Configuration

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

-			OutputDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

 			ConfigurationType="1"

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

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="1"

 			>

 			<Tool

@@ -471,21 +389,13 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TargetEnvironment="1"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				ExecutionBucket="7"

-				Optimization="0"

-				FavorSizeOrSpeed="0"

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

-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;$(ARCHFAM);$(_ARCHFAM_);SMARTPHONE2003_UI_MODEL;SMARTPHONE2003_UI_MODEL"

-				ExceptionHandling="0"

-				RuntimeLibrary="1"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-				CompileAs="0"

-				CompileForArchitecture="0"

+				PreprocessorDefinitions=""

+				PrecompiledHeaderFile=""

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -498,12 +408,10 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalOptions=""

 				AdditionalDependencies="ws2.lib"

-				GenerateDebugInformation="true"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="0"

+				OutputFile="..\bin\pjnath-test-$(TargetCPU)-wm6std-vs$(VSVer)-$(ConfigurationName).exe"

+

+

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -531,10 +439,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release-Dynamic|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

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

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -553,33 +459,18 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName="./output/pjnath-test-i386-win32-vc8-release/pjnath_test.tlb"

-				HeaderFileName=""

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

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

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;PJ_WIN32=1;PJ_M_I386=1"

-				StringPooling="true"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile="./output/pjnath-test-i386-win32-vc8-release/pjnath_test.pch"

-				AssemblerListingLocation="./output/pjnath-test-i386-win32-vc8-release/"

-				ObjectFile="./output/pjnath-test-i386-win32-vc8-release/"

-				ProgramDataBaseFileName="./output/pjnath-test-i386-win32-vc8-release/"

-				BrowseInformation="1"

-				WarningLevel="4"

-				SuppressStartupBanner="true"

+				PreprocessorDefinitions="_CONSOLE;"

+				PrecompiledHeaderFile=""

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

@@ -587,12 +478,9 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib "

-				OutputFile="../bin/pjnath-test-i386-win32-vc8-release.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile="./output/pjnath-test-i386-win32-vc8-release/pjnath-test-i386-win32-vc8-release.pdb"

-				SubSystem="1"

-				TargetMachine="1"

+				OutputFile="..\bin\pjnath-test-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName).exe"

+

+

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -605,8 +493,6 @@
 			/>

 			<Tool

 				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile="./output/pjnath-test-i386-win32-vc8-release/pjnath_test.bsc"

 			/>

 			<Tool

 				Name="VCFxCopTool"

@@ -623,9 +509,9 @@
 		</Configuration>

 		<Configuration

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

-			OutputDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

 			ConfigurationType="1"

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

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="1"

 			>

 			<Tool

@@ -642,21 +528,13 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TargetEnvironment="1"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				ExecutionBucket="7"

-				Optimization="2"

-				FavorSizeOrSpeed="2"

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

-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_);SMARTPHONE2003_UI_MODEL;SMARTPHONE2003_UI_MODEL"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				WarningLevel="3"

-				DebugInformationFormat="0"

-				CompileAs="0"

-				CompileForArchitecture="0"

+				PreprocessorDefinitions=""

+				PrecompiledHeaderFile=""

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -669,11 +547,10 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalOptions=""

 				AdditionalDependencies="ws2.lib"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="0"

+				OutputFile="..\bin\pjnath-test-$(TargetCPU)-wm6std-vs$(VSVer)-$(ConfigurationName).exe"

+

+

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -701,10 +578,8 @@
 		</Configuration>

 		<Configuration

 			Name="Debug-Dynamic|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

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

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -723,33 +598,18 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName="./output/pjnath-test-i386-win32-vc8-debug/pjnath_test.tlb"

-				HeaderFileName=""

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="0"

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

-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;PJ_WIN32=1;PJ_M_I386=1"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				PrecompiledHeaderFile="./output/pjnath-test-i386-win32-vc8-debug/pjnath_test.pch"

-				AssemblerListingLocation="./output/pjnath-test-i386-win32-vc8-debug/"

-				ObjectFile="./output/pjnath-test-i386-win32-vc8-debug/"

-				ProgramDataBaseFileName="./output/pjnath-test-i386-win32-vc8-debug/"

-				BrowseInformation="1"

-				WarningLevel="4"

-				SuppressStartupBanner="true"

-				DebugInformationFormat="4"

+				PreprocessorDefinitions="_CONSOLE;"

+				PrecompiledHeaderFile=""

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

@@ -757,13 +617,9 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="netapi32.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib"

-				OutputFile="../bin/pjnath-test-i386-win32-vc8-debug.exe"

-				LinkIncremental="2"

-				SuppressStartupBanner="true"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="./output/pjnath-test-i386-win32-vc8-debug/pjnath-test-i386-win32-vc8-debug.pdb"

-				SubSystem="1"

-				TargetMachine="1"

+				OutputFile="..\bin\pjnath-test-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName).exe"

+

+

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -776,8 +632,6 @@
 			/>

 			<Tool

 				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile="./output/pjnath-test-i386-win32-vc8-debug/pjnath_test.bsc"

 			/>

 			<Tool

 				Name="VCFxCopTool"

@@ -794,9 +648,9 @@
 		</Configuration>

 		<Configuration

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

-			OutputDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

 			ConfigurationType="1"

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

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="1"

 			>

 			<Tool

@@ -813,21 +667,13 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TargetEnvironment="1"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				ExecutionBucket="7"

-				Optimization="0"

-				FavorSizeOrSpeed="0"

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

-				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;$(ARCHFAM);$(_ARCHFAM_);SMARTPHONE2003_UI_MODEL;SMARTPHONE2003_UI_MODEL"

-				ExceptionHandling="0"

-				RuntimeLibrary="1"

-				WarningLevel="3"

-				DebugInformationFormat="3"

-				CompileAs="0"

-				CompileForArchitecture="0"

+				PreprocessorDefinitions=""

+				PrecompiledHeaderFile=""

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -840,12 +686,10 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalOptions=""

 				AdditionalDependencies="ws2.lib"

-				GenerateDebugInformation="true"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="0"

+				OutputFile="..\bin\pjnath-test-$(TargetCPU)-wm6std-vs$(VSVer)-$(ConfigurationName).exe"

+

+

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -873,10 +717,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release-Static|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(OutDir)"

 			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

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

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -895,33 +737,18 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TypeLibraryName="./output/pjnath-test-i386-win32-vc8-release/pjnath_test.tlb"

-				HeaderFileName=""

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

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

-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;PJ_WIN32=1;PJ_M_I386=1"

-				StringPooling="true"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="true"

-				PrecompiledHeaderFile="./output/pjnath-test-i386-win32-vc8-release/pjnath_test.pch"

-				AssemblerListingLocation="./output/pjnath-test-i386-win32-vc8-release/"

-				ObjectFile="./output/pjnath-test-i386-win32-vc8-release/"

-				ProgramDataBaseFileName="./output/pjnath-test-i386-win32-vc8-release/"

-				BrowseInformation="1"

-				WarningLevel="4"

-				SuppressStartupBanner="true"

+				PreprocessorDefinitions="_CONSOLE;"

+				PrecompiledHeaderFile=""

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

@@ -929,12 +756,9 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib "

-				OutputFile="../bin/pjnath-test-i386-win32-vc8-release.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="true"

-				ProgramDatabaseFile="./output/pjnath-test-i386-win32-vc8-release/pjnath-test-i386-win32-vc8-release.pdb"

-				SubSystem="1"

-				TargetMachine="1"

+				OutputFile="..\bin\pjnath-test-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName).exe"

+

+

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -947,8 +771,6 @@
 			/>

 			<Tool

 				Name="VCBscMakeTool"

-				SuppressStartupBanner="true"

-				OutputFile="./output/pjnath-test-i386-win32-vc8-release/pjnath_test.bsc"

 			/>

 			<Tool

 				Name="VCFxCopTool"

@@ -965,9 +787,445 @@
 		</Configuration>

 		<Configuration

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

-			OutputDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 6 Standard SDK (ARMV4I)\$(ConfigurationName)"

 			ConfigurationType="1"

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

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				ExecutionBucket="7"

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

+				PreprocessorDefinitions=""

+				PrecompiledHeaderFile=""

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="ws2.lib"

+				OutputFile="..\bin\pjnath-test-$(TargetCPU)-wm6std-vs$(VSVer)-$(ConfigurationName).exe"

+

+

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCCodeSignTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

+			/>

+			<DebuggerTool

+			/>

+		</Configuration>

+		<Configuration

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

+			OutputDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"

+			IntermediateDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"

+			ConfigurationType="1"

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

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="1"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				ExecutionBucket="7"

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

+				PreprocessorDefinitions=""

+				PrecompiledHeaderFile=""

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="ws2.lib"

+				TargetMachine="0"

+				OutputFile="..\bin\pjnath-test-$(TargetCPU)-wm6pro-vs$(VSVer)-$(ConfigurationName).exe"

+

+

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCCodeSignTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

+			/>

+			<DebuggerTool

+			/>

+		</Configuration>

+		<Configuration

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

+			OutputDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"

+			IntermediateDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"

+			ConfigurationType="1"

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

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="1"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				ExecutionBucket="7"

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

+				PreprocessorDefinitions=""

+				PrecompiledHeaderFile=""

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="ws2.lib"

+				TargetMachine="0"

+				OutputFile="..\bin\pjnath-test-$(TargetCPU)-wm6pro-vs$(VSVer)-$(ConfigurationName).exe"

+

+

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCCodeSignTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

+			/>

+			<DebuggerTool

+			/>

+		</Configuration>

+		<Configuration

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

+			OutputDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"

+			IntermediateDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"

+			ConfigurationType="1"

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

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="1"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				ExecutionBucket="7"

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

+				PreprocessorDefinitions=""

+				PrecompiledHeaderFile=""

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="ws2.lib"

+				TargetMachine="0"

+				OutputFile="..\bin\pjnath-test-$(TargetCPU)-wm6pro-vs$(VSVer)-$(ConfigurationName).exe"

+

+

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCCodeSignTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

+			/>

+			<DebuggerTool

+			/>

+		</Configuration>

+		<Configuration

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

+			OutputDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"

+			IntermediateDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"

+			ConfigurationType="1"

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

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="1"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				ExecutionBucket="7"

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

+				PreprocessorDefinitions=""

+				PrecompiledHeaderFile=""

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="ws2.lib"

+				TargetMachine="0"

+				OutputFile="..\bin\pjnath-test-$(TargetCPU)-wm6pro-vs$(VSVer)-$(ConfigurationName).exe"

+

+

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCCodeSignTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

+			/>

+			<DebuggerTool

+			/>

+		</Configuration>

+		<Configuration

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

+			OutputDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"

+			IntermediateDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"

+			ConfigurationType="1"

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

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+				TargetEnvironment="1"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				ExecutionBucket="7"

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

+				PreprocessorDefinitions=""

+				PrecompiledHeaderFile=""

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="ws2.lib"

+				TargetMachine="0"

+				OutputFile="..\bin\pjnath-test-$(TargetCPU)-wm6pro-vs$(VSVer)-$(ConfigurationName).exe"

+

+

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCCodeSignTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+			<DeploymentTool

+				ForceDirty="-1"

+				RemoteDirectory=""

+				RegisterOutput="0"

+				AdditionalFiles=""

+			/>

+			<DebuggerTool

+			/>

+		</Configuration>

+		<Configuration

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

+			OutputDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"

+			IntermediateDirectory="Windows Mobile 6 Professional SDK (ARMV4I)\$(ConfigurationName)"

+			ConfigurationType="1"

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

+			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="1"

 			>

 			<Tool

@@ -989,16 +1247,9 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				ExecutionBucket="7"

-				Optimization="2"

-				FavorSizeOrSpeed="2"

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

-				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_);SMARTPHONE2003_UI_MODEL;SMARTPHONE2003_UI_MODEL"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				WarningLevel="3"

-				DebugInformationFormat="0"

-				CompileAs="0"

-				CompileForArchitecture="0"

+				PreprocessorDefinitions=""

+				PrecompiledHeaderFile=""

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -1011,11 +1262,11 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalOptions=""

 				AdditionalDependencies="ws2.lib"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

 				TargetMachine="0"

+				OutputFile="..\bin\pjnath-test-$(TargetCPU)-wm6pro-vs$(VSVer)-$(ConfigurationName).exe"

+

+

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1212,6 +1463,54 @@
 						Name="VCCLCompilerTool"

 					/>

 				</FileConfiguration>

+				<FileConfiguration

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

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

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

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

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

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

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

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

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

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

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

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\src\pjnath-test\main_win32.c"