Modified pjsip tests

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

9 files changed, 27 insertions, 1539 deletions

diff --git a/pjsip/build/pjsip.dsw b/pjsip/build/pjsip.dsw
index 7c9230da..562d33eb 100644
--- a/pjsip/build/pjsip.dsw
+++ b/pjsip/build/pjsip.dsw
@@ -57,7 +57,7 @@ Package=<4>
 

 ###############################################################################

 

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

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

 

 Package=<5>

 {{{

diff --git a/pjsip/build/pjsip_auth.vcproj b/pjsip/build/pjsip_auth.vcproj
deleted file mode 100644
index bb42f3f1..00000000
--- a/pjsip/build/pjsip_auth.vcproj
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="pjsip_auth_lib"

-	ProjectGUID="{FC63AE7E-423F-464D-B84E-B20B38046B19}"

-	SccProjectName="&quot;$/pjproject&quot;, PIAAAAAA"

-	SccAuxPath=""

-	SccLocalPath="..\.."

-	SccProvider="MSSCCI:Microsoft Visual SourceSafe">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\output\pjsip_auth_vc7_Release"

-			IntermediateDirectory=".\output\pjsip_auth_vc7_Release"

-			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="../src,../../pjlib/src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				StringPooling="TRUE"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\output\pjsip_auth_vc7_Release/pjsip_auth.pch"

-				AssemblerListingLocation=".\output\pjsip_auth_vc7_Release/"

-				ObjectFile=".\output\pjsip_auth_vc7_Release/"

-				ProgramDataBaseFileName=".\output\pjsip_auth_vc7_Release/"

-				BrowseInformation="1"

-				WarningLevel="4"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="3"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\lib\pjsip_auth_vc7s.lib"

-				SuppressStartupBanner="TRUE"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\output\pjsip_auth_vc7_Debug"

-			IntermediateDirectory=".\output\pjsip_auth_vc7_Debug"

-			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../src,../../pjlib/src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				PrecompiledHeaderFile=".\output\pjsip_auth_vc7_Debug/pjsip_auth.pch"

-				AssemblerListingLocation=".\output\pjsip_auth_vc7_Debug/"

-				ObjectFile=".\output\pjsip_auth_vc7_Debug/"

-				ProgramDataBaseFileName=".\output\pjsip_auth_vc7_Debug/"

-				BrowseInformation="1"

-				WarningLevel="4"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="4"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\lib\pjsip_auth_vc7sd.lib"

-				SuppressStartupBanner="TRUE"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

-			<File

-				RelativePath="..\src\pjsip_auth\sip_auth.c">

-			</File>

-			<File

-				RelativePath="..\src\pjsip_auth\sip_auth_msg.c">

-			</File>

-			<File

-				RelativePath="..\src\pjsip_auth\sip_auth_parser.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl">

-			<File

-				RelativePath="..\src\pjsip_auth.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip_auth\sip_auth.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip_auth\sip_auth_msg.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip_auth\sip_auth_parser.h">

-			</File>

-		</Filter>

-		<Filter

-			Name="Inline Files"

-			Filter="">

-		</Filter>

-		<Filter

-			Name="Private Files"

-			Filter="">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/pjsip/build/pjsip_callgen.vcproj b/pjsip/build/pjsip_callgen.vcproj
deleted file mode 100644
index e2f73d1f..00000000
--- a/pjsip/build/pjsip_callgen.vcproj
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="pjsip_callgen"

-	ProjectGUID="{DCBEF2A3-D444-46FC-82E7-D939113EECA7}"

-	SccProjectName="SAK"

-	SccAuxPath="SAK"

-	SccLocalPath="SAK"

-	SccProvider="SAK"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="./output/pjsip_callgen_vc7_Debug"

-			IntermediateDirectory="./output/pjsip_callgen_vc7_Debug"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="3"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="../bin/pjcallgen_vc7d.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/pjcallgen.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="./output/pjsip_callgen_vc7_Release"

-			IntermediateDirectory="./output/pjsip_callgen_vc7_Release"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

-				UsePrecompiledHeader="3"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="../bin/pjcallgen_vc7.exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/pjsip/build/pjsip_core.vcproj b/pjsip/build/pjsip_core.vcproj
deleted file mode 100644
index cb91bbe3..00000000
--- a/pjsip/build/pjsip_core.vcproj
+++ /dev/null
@@ -1,388 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="pjsip_core_lib"

-	ProjectGUID="{58A72B82-7369-4B89-B511-7191A6B0D8C3}"

-	SccProjectName="&quot;$/pjproject&quot;, PIAAAAAA"

-	SccAuxPath=""

-	SccLocalPath="..\.."

-	SccProvider="MSSCCI:Microsoft Visual SourceSafe">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\output\pjsip_core_vc7_Release"

-			IntermediateDirectory=".\output\pjsip_core_vc7_Release"

-			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="../src,../../pjlib/src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				StringPooling="TRUE"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\output\pjsip_core_vc7_Release/pjsip_core.pch"

-				AssemblerListingLocation=".\output\pjsip_core_vc7_Release/"

-				ObjectFile=".\output\pjsip_core_vc7_Release/"

-				ProgramDataBaseFileName=".\output\pjsip_core_vc7_Release/"

-				BrowseInformation="1"

-				WarningLevel="4"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="3"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\lib\pjsip_core_vc7s.lib"

-				SuppressStartupBanner="TRUE"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\output\pjsip_core_vc7_Debug"

-			IntermediateDirectory=".\output\pjsip_core_vc7_Debug"

-			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../src,../../pjlib/src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				PrecompiledHeaderFile=".\output\pjsip_core_vc7_Debug/pjsip_core.pch"

-				AssemblerListingLocation=".\output\pjsip_core_vc7_Debug/"

-				ObjectFile=".\output\pjsip_core_vc7_Debug/"

-				ProgramDataBaseFileName=".\output\pjsip_core_vc7_Debug/"

-				BrowseInformation="1"

-				WarningLevel="4"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="4"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\lib\pjsip_core_vc7sd.lib"

-				SuppressStartupBanner="TRUE"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

-			<File

-				RelativePath="..\src\pjsip\sip_auth.c">

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_auth_msg.c">

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_auth_parser.c">

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_endpoint.c">

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_misc.c">

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_msg.c">

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_parser.c">

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_resolve.c">

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_transaction.c">

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_transport.c">

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_uri.c">

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl">

-			<File

-				RelativePath="..\src\pjsip_core.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip\print.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_auth.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_auth_msg.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_auth_parser.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_config.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_endpoint.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_event.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_misc.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_module.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_msg.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_parser.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_private.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_resolve.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_transaction.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_transport.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_types.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip\sip_uri.h">

-			</File>

-		</Filter>

-		<Filter

-			Name="Inline Files"

-			Filter="">

-			<File

-				RelativePath="..\src\pjsip\sip_msg_i.h">

-			</File>

-		</Filter>

-		<File

-			RelativePath="..\..\RELNOTES.txt">

-		</File>

-		<File

-			RelativePath=".\TODO.txt">

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/pjsip/build/pjsip_core_test.vcproj b/pjsip/build/pjsip_core_test.vcproj
deleted file mode 100644
index ce4d6486..00000000
--- a/pjsip/build/pjsip_core_test.vcproj
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="pjsip_core_test"

-	ProjectGUID="{782BF0C1-FE0E-48A9-B875-31E7BF9F4B5B}"

-	SccProjectName="&quot;$/pjproject&quot;, PIAAAAAA"

-	SccAuxPath=""

-	SccLocalPath="..\.."

-	SccProvider="MSSCCI:Microsoft Visual SourceSafe">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\output\pjsip_core_test_vc7_Release"

-			IntermediateDirectory=".\output\pjsip_core_test_vc7_Release"

-			ConfigurationType="1"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="../src,../../pjlib/src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\output\pjsip_core_test_vc7_Release/pjsip_core_test.pch"

-				AssemblerListingLocation=".\output\pjsip_core_test_vc7_Release/"

-				ObjectFile=".\output\pjsip_core_test_vc7_Release/"

-				ProgramDataBaseFileName=".\output\pjsip_core_test_vc7_Release/"

-				BrowseInformation="1"

-				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="3"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="..\bin\pjsip_core_test_vc7.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

-				GenerateDebugInformation="TRUE"

-				GenerateMapFile="TRUE"

-				MapFileName=".\output\pjsip_core_test_vc7_Release/pjsip_core_test.map"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\output\pjsip_core_test_vc7_Release/pjsip_core_test.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\output\pjsip_core_test_vc7_Debug"

-			IntermediateDirectory=".\output\pjsip_core_test_vc7_Debug"

-			ConfigurationType="1"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../src,../../pjlib/src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				PrecompiledHeaderFile=".\output\pjsip_core_test_vc7_Debug/pjsip_core_test.pch"

-				AssemblerListingLocation=".\output\pjsip_core_test_vc7_Debug/"

-				ObjectFile=".\output\pjsip_core_test_vc7_Debug/"

-				ProgramDataBaseFileName=".\output\pjsip_core_test_vc7_Debug/"

-				BrowseInformation="1"

-				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="4"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="netapi32.lib wsock32.lib odbc32.lib odbccp32.lib"

-				OutputFile="..\bin\pjsip_core_test_vc7d.exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="TRUE"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\output\pjsip_core_test_vc7_Debug/pjsip_core_test.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\output\pjsip_core_test_vc7_Debug/pjsip_core_test.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

-			<File

-				RelativePath="..\src\tests\pjsip_core\main.c">

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\src\tests\pjsip_core\test_msg.c">

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\src\tests\pjsip_core\test_uri.c">

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl">

-			<File

-				RelativePath="..\src\tests\pjsip_core\test.h">

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/pjsip/build/pjsip_simple.vcproj b/pjsip/build/pjsip_simple.vcproj
deleted file mode 100644
index ad812886..00000000
--- a/pjsip/build/pjsip_simple.vcproj
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="pjsip_simple_lib"

-	ProjectGUID="{B5C20C39-AF03-405D-BF59-B4C2E8D68BDE}"

-	SccProjectName="&quot;$/pjproject/pjsip&quot;, QIAAAAAA"

-	SccAuxPath=""

-	SccLocalPath=".."

-	SccProvider="MSSCCI:Microsoft Visual SourceSafe">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\./output/pjsip_simple_Win32_Debug"

-			IntermediateDirectory=".\./output/pjsip_simple_Win32_Debug"

-			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../src,../../pjlib/src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\./output/pjsip_simple_Win32_Debug/pjsip_simple.pch"

-				AssemblerListingLocation=".\./output/pjsip_simple_Win32_Debug/"

-				ObjectFile=".\./output/pjsip_simple_Win32_Debug/"

-				ProgramDataBaseFileName=".\./output/pjsip_simple_Win32_Debug/"

-				BrowseInformation="1"

-				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="4"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../lib/pjsip_simple_vc6d.lib"

-				SuppressStartupBanner="TRUE"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\./output/pjsip_simple_Win32_Release"

-			IntermediateDirectory=".\./output/pjsip_simple_Win32_Release"

-			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="../src,../../pjlib/src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				StringPooling="TRUE"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\./output/pjsip_simple_Win32_Release/pjsip_simple.pch"

-				AssemblerListingLocation=".\./output/pjsip_simple_Win32_Release/"

-				ObjectFile=".\./output/pjsip_simple_Win32_Release/"

-				ProgramDataBaseFileName=".\./output/pjsip_simple_Win32_Release/"

-				WarningLevel="3"

-				SuppressStartupBanner="TRUE"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../lib/pjsip_simple_vc6.lib"

-				SuppressStartupBanner="TRUE"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

-			<File

-				RelativePath="..\src\pjsip_simple\event_notify.c">

-			</File>

-			<File

-				RelativePath="..\src\pjsip_simple\event_notify_msg.c">

-			</File>

-			<File

-				RelativePath="..\src\pjsip_simple\messaging.c">

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\src\pjsip_simple\pidf.c">

-			</File>

-			<File

-				RelativePath="..\src\pjsip_simple\presence.c">

-			</File>

-			<File

-				RelativePath="..\src\pjsip_simple\xpidf.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl">

-			<File

-				RelativePath="..\src\pjsip_simple\event_notify.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip_simple\event_notify_msg.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip_simple\messaging.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip_simple\pidf.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip_simple.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip_simple\presence.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip_simple\xpidf.h">

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/pjsip/build/pjsip_ua.vcproj b/pjsip/build/pjsip_ua.vcproj
deleted file mode 100644
index a0811308..00000000
--- a/pjsip/build/pjsip_ua.vcproj
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="pjsip_ua_lib"

-	ProjectGUID="{DEE358A5-ADD3-4403-AD82-4967E63F17D1}"

-	SccProjectName="&quot;$/pjproject&quot;, PIAAAAAA"

-	SccAuxPath=""

-	SccLocalPath="..\.."

-	SccProvider="MSSCCI:Microsoft Visual SourceSafe">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\output\pjsip_ua_vc7_Debug"

-			IntermediateDirectory=".\output\pjsip_ua_vc7_Debug"

-			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../src,../../pjlib/src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				PrecompiledHeaderFile=".\output\pjsip_ua_vc7_Debug/pjsip_ua.pch"

-				AssemblerListingLocation=".\output\pjsip_ua_vc7_Debug/"

-				ObjectFile=".\output\pjsip_ua_vc7_Debug/"

-				ProgramDataBaseFileName=".\output\pjsip_ua_vc7_Debug/"

-				BrowseInformation="1"

-				WarningLevel="4"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="4"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\lib\pjsip_ua_vc7sd.lib"

-				SuppressStartupBanner="TRUE"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\output\pjsip_ua_vc7_Release"

-			IntermediateDirectory=".\output\pjsip_ua_vc7_Release"

-			ConfigurationType="4"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="../src,../../pjlib/src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				StringPooling="TRUE"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\output\pjsip_ua_vc7_Release/pjsip_ua.pch"

-				AssemblerListingLocation=".\output\pjsip_ua_vc7_Release/"

-				ObjectFile=".\output\pjsip_ua_vc7_Release/"

-				ProgramDataBaseFileName=".\output\pjsip_ua_vc7_Release/"

-				BrowseInformation="1"

-				WarningLevel="4"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="3"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\lib\pjsip_ua_vc7s.lib"

-				SuppressStartupBanner="TRUE"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

-			<File

-				RelativePath="..\src\pjsip_mod_ua\sip_dialog.c">

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\src\pjsip_mod_ua\sip_reg.c">

-			</File>

-			<File

-				RelativePath="..\src\pjsip_mod_ua\sip_ua.c">

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl">

-			<File

-				RelativePath="..\src\pjsip_ua.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip_mod_ua\sip_dialog.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip_mod_ua\sip_reg.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip_mod_ua\sip_ua.h">

-			</File>

-			<File

-				RelativePath="..\src\pjsip_mod_ua\sip_ua_private.h">

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/pjsip/build/pjsua.vcproj b/pjsip/build/pjsua.vcproj
deleted file mode 100644
index 0f028746..00000000
--- a/pjsip/build/pjsua.vcproj
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="pjsua"

-	ProjectGUID="{B8500B7B-C6A8-46B9-84E6-90E200C1B35A}"

-	SccProjectName="&quot;$/pjproject&quot;, PIAAAAAA"

-	SccAuxPath=""

-	SccLocalPath="..\.."

-	SccProvider="MSSCCI:Microsoft Visual SourceSafe">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory=".\.\output\pjsua_vc7_Release"

-			IntermediateDirectory=".\.\output\pjsua_vc7_Release"

-			ConfigurationType="1"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="2"

-				InlineFunctionExpansion="1"

-				AdditionalIncludeDirectories="../src,../../pjlib/src,../../pjmedia/src,../../pjsdp/src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				StringPooling="TRUE"

-				RuntimeLibrary="2"

-				EnableFunctionLevelLinking="TRUE"

-				UsePrecompiledHeader="2"

-				PrecompiledHeaderFile=".\.\output\pjsua_vc7_Release/pjsua.pch"

-				AssemblerListingLocation=".\.\output\pjsua_vc7_Release/"

-				ObjectFile=".\.\output\pjsua_vc7_Release/"

-				ProgramDataBaseFileName=".\.\output\pjsua_vc7_Release/"

-				BrowseInformation="1"

-				WarningLevel="4"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="3"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalOptions="/FIXED:NO"

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

-				OutputFile="..\bin\pjsua_vc7.exe"

-				LinkIncremental="1"

-				SuppressStartupBanner="TRUE"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\.\output\pjsua_vc7_Release/pjsua.pdb"

-				GenerateMapFile="TRUE"

-				MapFileName=".\.\output\pjsua_vc7_Release/pjsua.map"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\.\output\pjsua_vc7_Release/pjsua.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="NDEBUG"

-				Culture="1033"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory=".\.\output\pjsua_vc7_Debug"

-			IntermediateDirectory=".\.\output\pjsua_vc7_Debug"

-			ConfigurationType="1"

-			UseOfMFC="0"

-			ATLMinimizesCRunTimeLibraryUsage="FALSE"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../src,../../pjlib/src,../../pjmedia/src,../../pjsdp/src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				PrecompiledHeaderFile=".\.\output\pjsua_vc7_Debug/pjsua.pch"

-				AssemblerListingLocation=".\.\output\pjsua_vc7_Debug/"

-				ObjectFile=".\.\output\pjsua_vc7_Debug/"

-				ProgramDataBaseFileName=".\.\output\pjsua_vc7_Debug/"

-				BrowseInformation="1"

-				WarningLevel="4"

-				SuppressStartupBanner="TRUE"

-				DebugInformationFormat="4"

-				CompileAs="0"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

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

-				OutputFile="..\bin\pjsua_vc7d.exe"

-				LinkIncremental="0"

-				SuppressStartupBanner="TRUE"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile=".\.\output\pjsua_vc7_Debug/pjsua.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"

-				TypeLibraryName=".\.\output\pjsua_vc7_Debug/pjsua.tlb"

-				HeaderFileName=""/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_DEBUG"

-				Culture="1033"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

-			<File

-				RelativePath="..\src\pjsua\getopt.c">

-			</File>

-			<File

-				RelativePath="..\src\pjsua\main.c">

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="2"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BrowseInformation="1"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						Optimization="0"

-						AdditionalIncludeDirectories=""

-						PreprocessorDefinitions=""

-						BasicRuntimeChecks="3"

-						BrowseInformation="1"/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath="..\src\pjsua\misc.c">

-				<FileConfiguration

-					Name="Release|Win32"

-					ExcludedFromBuild="TRUE">

-					<Tool

-						Name="VCCLCompilerTool"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32"

-					ExcludedFromBuild="TRUE">

-					<Tool

-						Name="VCCLCompilerTool"/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl">

-			<File

-				RelativePath="..\src\pjsua\getopt.h">

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/pjsip/build/pjsip_core_test.dsp b/pjsip/build/test_pjsip.dsp
index 1af89ec5..c01f737b 100644
--- a/pjsip/build/pjsip_core_test.dsp
+++ b/pjsip/build/test_pjsip.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="pjsip_core_test" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="test_pjsip" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

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

 

-CFG=pjsip_core_test - Win32 Debug

+CFG=test_pjsip - 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 "pjsip_core_test.mak".

+!MESSAGE NMAKE /f "test_pjsip.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 "pjsip_core_test.mak" CFG="pjsip_core_test - Win32 Debug"

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

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

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

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

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

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

 !MESSAGE 

 

 # Begin Project

@@ -28,21 +28,21 @@ CFG=pjsip_core_test - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

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

+!IF  "$(CFG)" == "test_pjsip - 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 Output_Dir ".\output\test-pjsip-i386-win32-vc6-release"

+# PROP BASE Intermediate_Dir ".\output\test-pjsip-i386-win32-vc6-release"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\output\pjsip_core_test_vc6_Release"

-# PROP Intermediate_Dir ".\output\pjsip_core_test_vc6_Release"

+# PROP Output_Dir ".\output\test-pjsip-i386-win32-vc6-release"

+# PROP Intermediate_Dir ".\output\test-pjsip-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 "../src" /I "../../pjlib/src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /c

+# ADD CPP /nologo /MD /W3 /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "PJ_WIN32" /D "PJ_M_I386" /FR /FD /c

 # SUBTRACT CPP /YX

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

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

@@ -51,23 +51,23 @@ BSC32=bscmake.exe
 # 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 wsock32.lib kernel32.lib netapi32.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 /profile /map /debug /machine:I386 /out:"..\bin\pjsip_core_test_vc6.exe"

+# ADD LINK32 wsock32.lib kernel32.lib netapi32.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 /profile /map /debug /machine:I386 /out:"..\bin\test-pjsip-i386-win32-vc6-release.exe"

 

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

+!ELSEIF  "$(CFG)" == "test_pjsip - 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 Output_Dir ".\output\test-pjsip-i386-win32-vc6-debug"

+# PROP BASE Intermediate_Dir ".\output\test-pjsip-i386-win32-vc6-debug"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\output\pjsip_core_test_vc6_Debug"

-# PROP Intermediate_Dir ".\output\pjsip_core_test_vc6_Debug"

+# PROP Output_Dir ".\output\test-pjsip-i386-win32-vc6-debug"

+# PROP Intermediate_Dir ".\output\test-pjsip-i386-win32-vc6-debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

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

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

 # SUBTRACT CPP /YX

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

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

@@ -76,28 +76,28 @@ BSC32=bscmake.exe
 # 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 wsock32.lib kernel32.lib netapi32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\bin\pjsip_core_test_vc6d.exe" /pdbtype:sept

+# ADD LINK32 wsock32.lib kernel32.lib netapi32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\bin\test-pjsip-i386-win32-vc6-debug.exe" /pdbtype:sept

 

 !ENDIF 

 

 # Begin Target

 

-# Name "pjsip_core_test - Win32 Release"

-# Name "pjsip_core_test - Win32 Debug"

+# Name "test_pjsip - Win32 Release"

+# Name "test_pjsip - Win32 Debug"

 # Begin Group "Source Files"

 

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

 # Begin Source File

 

-SOURCE=..\src\tests\pjsip_core\main.c

+SOURCE="..\src\test-pjsip\main.c"

 # End Source File

 # Begin Source File

 

-SOURCE=..\src\tests\pjsip_core\test_msg.c

+SOURCE="..\src\test-pjsip\test_msg.c"

 # End Source File

 # Begin Source File

 

-SOURCE=..\src\tests\pjsip_core\test_uri.c

+SOURCE="..\src\test-pjsip\test_uri.c"

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -105,7 +105,7 @@ SOURCE=..\src\tests\pjsip_core\test_uri.c
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

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

+SOURCE="..\src\test-pjsip\test.h"

 # End Source File

 # End Group

 # Begin Group "Resource Files"