Add protobuf 2.3.0 sources

This is the contents of protobuf-2.3.0.tar.bz2 from
http://code.google.com/p/protobuf/downloads/list.

Change-Id: Idfde09ce7ef5ac027b07ee83f2674fbbed5c30b2

12 files changed, 417 insertions, 422 deletions

diff --git a/gtest/msvc/gtest-md.sln b/gtest/msvc/gtest-md.sln
new file mode 100644
index 0000000..f7908da
--- /dev/null
+++ b/gtest/msvc/gtest-md.sln
@@ -0,0 +1,45 @@
+Microsoft Visual Studio Solution File, Format Version 8.00

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-md", "gtest-md.vcproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}"

+	ProjectSection(ProjectDependencies) = postProject

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main-md", "gtest_main-md.vcproj", "{3AF54C8A-10BF-4332-9147-F68ED9862033}"

+	ProjectSection(ProjectDependencies) = postProject

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test-md", "gtest_prod_test-md.vcproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}"

+	ProjectSection(ProjectDependencies) = postProject

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest-md", "gtest_unittest-md.vcproj", "{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}"

+	ProjectSection(ProjectDependencies) = postProject

+	EndProjectSection

+EndProject

+Global

+	GlobalSection(SolutionConfiguration) = preSolution

+		Debug = Debug

+		Release = Release

+	EndGlobalSection

+	GlobalSection(ProjectConfiguration) = postSolution

+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug.ActiveCfg = Debug|Win32

+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug.Build.0 = Debug|Win32

+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release.ActiveCfg = Release|Win32

+		{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release.Build.0 = Release|Win32

+		{3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug.ActiveCfg = Debug|Win32

+		{3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug.Build.0 = Debug|Win32

+		{3AF54C8A-10BF-4332-9147-F68ED9862033}.Release.ActiveCfg = Release|Win32

+		{3AF54C8A-10BF-4332-9147-F68ED9862033}.Release.Build.0 = Release|Win32

+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug.ActiveCfg = Debug|Win32

+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug.Build.0 = Debug|Win32

+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release.ActiveCfg = Release|Win32

+		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release.Build.0 = Release|Win32

+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug.ActiveCfg = Debug|Win32

+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug.Build.0 = Debug|Win32

+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release.ActiveCfg = Release|Win32

+		{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ExtensibilityGlobals) = postSolution

+	EndGlobalSection

+	GlobalSection(ExtensibilityAddIns) = postSolution

+	EndGlobalSection

+EndGlobal

diff --git a/gtest/msvc/gtest-md.vcproj b/gtest/msvc/gtest-md.vcproj
new file mode 100644
index 0000000..c78a4a4
--- /dev/null
+++ b/gtest/msvc/gtest-md.vcproj
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="7.10"

+	Name="gtest-md"

+	ProjectGUID="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}"

+	Keyword="Win32Proj">

+	<Platforms>

+		<Platform

+			Name="Win32"/>

+	</Platforms>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)/$(ProjectName)"

+			ConfigurationType="4"

+			CharacterSet="2"

+			ReferencesPath="">

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				MinimalRebuild="TRUE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="FALSE"

+				DebugInformationFormat="4"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="$(OutDir)/gtestd.lib"/>

+			<Tool

+				Name="VCMIDLTool"/>

+			<Tool

+				Name="VCPostBuildEventTool"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"/>

+			<Tool

+				Name="VCManagedWrapperGeneratorTool"/>

+			<Tool

+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)/$(ProjectName)"

+			ConfigurationType="4"

+			CharacterSet="2"

+			ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">

+			<Tool

+				Name="VCCLCompilerTool"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				RuntimeLibrary="2"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="FALSE"

+				DebugInformationFormat="3"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="$(OutDir)/gtest.lib"/>

+			<Tool

+				Name="VCMIDLTool"/>

+			<Tool

+				Name="VCPostBuildEventTool"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"/>

+			<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;def;odl;idl;hpj;bat;asm;asmx"

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

+			<File

+				RelativePath="..\src\gtest-death-test.cc">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\src\gtest-filepath.cc">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\src\gtest-port.cc">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\src\gtest-test-part.cc">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\src\gtest-typed-test.cc">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\src\gtest.cc">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>

+				</FileConfiguration>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

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

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

+			<File

+				RelativePath="..\include\gtest\internal\gtest-death-test-internal.h">

+			</File>

+			<File

+				RelativePath="..\include\gtest\gtest-death-test.h">

+			</File>

+			<File

+				RelativePath="..\include\gtest\internal\gtest-filepath.h">

+			</File>

+			<File

+				RelativePath="..\src\gtest-internal-inl.h">

+			</File>

+			<File

+				RelativePath="..\include\gtest\internal\gtest-internal.h">

+			</File>

+			<File

+				RelativePath="..\include\gtest\gtest-message.h">

+			</File>

+			<File

+				RelativePath="..\include\gtest\internal\gtest-port.h">

+			</File>

+			<File

+				RelativePath="..\include\gtest\gtest-spi.h">

+			</File>

+			<File

+				RelativePath="..\include\gtest\internal\gtest-string.h">

+			</File>

+			<File

+				RelativePath="..\include\gtest\gtest.h">

+			</File>

+			<File

+				RelativePath="..\include\gtest\gtest_pred_impl.h">

+			</File>

+			<File

+				RelativePath="..\include\gtest\gtest_prod.h">

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/gtest/msvc/gtest.sln b/gtest/msvc/gtest.sln
index 5619c12..ef4b057 100644
--- a/gtest/msvc/gtest.sln
+++ b/gtest/msvc/gtest.sln
@@ -11,30 +11,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest", "gtest_uni
 	ProjectSection(ProjectDependencies) = postProject

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_environment_test", "gtest_environment_test.vcproj", "{DF5FA93D-DC03-41A6-A18C-079198633450}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test", "gtest_prod_test.vcproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}"

 	ProjectSection(ProjectDependencies) = postProject

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_color_test_", "gtest_color_test_.vcproj", "{ABC5A7E8-072C-4A2D-B186-19EA5394B9C6}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_env_var_test_", "gtest_env_var_test_.vcproj", "{569C6F70-F41C-47F3-A622-8A88DC43D452}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_output_test_", "gtest_output_test_.vcproj", "{A4903F73-ED6C-4972-863E-F7355EB0145E}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_uninitialized_test_", "gtest_uninitialized_test_.vcproj", "{42B8A077-E162-4540-A688-246296ACAC1D}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

 Global

 	GlobalSection(SolutionConfiguration) = preSolution

 		Debug = Debug

@@ -53,30 +33,10 @@ Global
 		{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug.Build.0 = Debug|Win32

 		{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release.ActiveCfg = Release|Win32

 		{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release.Build.0 = Release|Win32

-		{DF5FA93D-DC03-41A6-A18C-079198633450}.Debug.ActiveCfg = Debug|Win32

-		{DF5FA93D-DC03-41A6-A18C-079198633450}.Debug.Build.0 = Debug|Win32

-		{DF5FA93D-DC03-41A6-A18C-079198633450}.Release.ActiveCfg = Release|Win32

-		{DF5FA93D-DC03-41A6-A18C-079198633450}.Release.Build.0 = Release|Win32

 		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug.ActiveCfg = Debug|Win32

 		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug.Build.0 = Debug|Win32

 		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release.ActiveCfg = Release|Win32

 		{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release.Build.0 = Release|Win32

-		{ABC5A7E8-072C-4A2D-B186-19EA5394B9C6}.Debug.ActiveCfg = Debug|Win32

-		{ABC5A7E8-072C-4A2D-B186-19EA5394B9C6}.Debug.Build.0 = Debug|Win32

-		{ABC5A7E8-072C-4A2D-B186-19EA5394B9C6}.Release.ActiveCfg = Release|Win32

-		{ABC5A7E8-072C-4A2D-B186-19EA5394B9C6}.Release.Build.0 = Release|Win32

-		{569C6F70-F41C-47F3-A622-8A88DC43D452}.Debug.ActiveCfg = Debug|Win32

-		{569C6F70-F41C-47F3-A622-8A88DC43D452}.Debug.Build.0 = Debug|Win32

-		{569C6F70-F41C-47F3-A622-8A88DC43D452}.Release.ActiveCfg = Release|Win32

-		{569C6F70-F41C-47F3-A622-8A88DC43D452}.Release.Build.0 = Release|Win32

-		{A4903F73-ED6C-4972-863E-F7355EB0145E}.Debug.ActiveCfg = Debug|Win32

-		{A4903F73-ED6C-4972-863E-F7355EB0145E}.Debug.Build.0 = Debug|Win32

-		{A4903F73-ED6C-4972-863E-F7355EB0145E}.Release.ActiveCfg = Release|Win32

-		{A4903F73-ED6C-4972-863E-F7355EB0145E}.Release.Build.0 = Release|Win32

-		{42B8A077-E162-4540-A688-246296ACAC1D}.Debug.ActiveCfg = Debug|Win32

-		{42B8A077-E162-4540-A688-246296ACAC1D}.Debug.Build.0 = Debug|Win32

-		{42B8A077-E162-4540-A688-246296ACAC1D}.Release.ActiveCfg = Release|Win32

-		{42B8A077-E162-4540-A688-246296ACAC1D}.Release.Build.0 = Release|Win32

 	EndGlobalSection

 	GlobalSection(ExtensibilityGlobals) = postSolution

 	EndGlobalSection

diff --git a/gtest/msvc/gtest.vcproj b/gtest/msvc/gtest.vcproj
index d38ea3b..09d5b93 100644
--- a/gtest/msvc/gtest.vcproj
+++ b/gtest/msvc/gtest.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory="Debug"

-			IntermediateDirectory="Debug"

+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)/$(ProjectName)"

 			ConfigurationType="4"

 			CharacterSet="2"

 			ReferencesPath="">

@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

+				Detect64BitPortabilityProblems="FALSE"

 				DebugInformationFormat="4"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

@@ -54,8 +54,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="Release"

+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)/$(ProjectName)"

 			ConfigurationType="4"

 			CharacterSet="2"

 			ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">

@@ -65,7 +65,7 @@
 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

+				Detect64BitPortabilityProblems="FALSE"

 				DebugInformationFormat="3"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

diff --git a/gtest/msvc/gtest_environment_test.vcproj b/gtest/msvc/gtest_environment_test.vcproj
deleted file mode 100644
index 69d0f42..0000000
--- a/gtest/msvc/gtest_environment_test.vcproj
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="gtest_environment_test"

-	ProjectGUID="{DF5FA93D-DC03-41A6-A18C-079198633450}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="Debug"

-			IntermediateDirectory="Debug"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="3"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/gtest_environment_test.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/gtest_unittest.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="Release"

-			IntermediateDirectory="Release"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="3"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/gtest_environment_test.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>

-		<ProjectReference

-			ReferencedProjectIdentifier="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"

-			Name="gtest"/>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

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

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

-			<File

-				RelativePath="..\test\gtest_environment_test.cc">

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"

-						UsePrecompiledHeader="0"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"

-						UsePrecompiledHeader="0"/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

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

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

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/gtest/msvc/gtest_env_var_test_.vcproj b/gtest/msvc/gtest_main-md.vcproj
index a61e7a2..321667f 100644
--- a/gtest/msvc/gtest_env_var_test_.vcproj
+++ b/gtest/msvc/gtest_main-md.vcproj
@@ -2,8 +2,8 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="7.10"

-	Name="gtest_env_var_test_"

-	ProjectGUID="{569C6F70-F41C-47F3-A622-8A88DC43D452}"

+	Name="gtest_main-md"

+	ProjectGUID="{3AF54C8A-10BF-4332-9147-F68ED9862033}"

 	Keyword="Win32Proj">

 	<Platforms>

 		<Platform

@@ -12,31 +12,27 @@
 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory="Debug"

-			IntermediateDirectory="Debug"

-			ConfigurationType="1"

-			CharacterSet="2">

+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)/$(ProjectName)"

+			ConfigurationType="4"

+			CharacterSet="2"

+			ReferencesPath="">

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

 				MinimalRebuild="TRUE"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

-				UsePrecompiledHeader="3"

+				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

+				Detect64BitPortabilityProblems="FALSE"

 				DebugInformationFormat="4"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

 			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/gtest_env_var_test_.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="TRUE"

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

-				SubSystem="1"

-				TargetMachine="1"/>

+				Name="VCLibrarianTool"

+				OutputFile="$(OutDir)/$(ProjectName)d.lib"/>

 			<Tool

 				Name="VCMIDLTool"/>

 			<Tool

@@ -52,37 +48,30 @@
 			<Tool

 				Name="VCXMLDataGeneratorTool"/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

 				Name="VCManagedWrapperGeneratorTool"/>

 			<Tool

 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="Release"

-			ConfigurationType="1"

-			CharacterSet="2">

+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)/$(ProjectName)"

+			ConfigurationType="4"

+			CharacterSet="2"

+			ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

 				RuntimeLibrary="2"

-				UsePrecompiledHeader="3"

+				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

+				Detect64BitPortabilityProblems="FALSE"

 				DebugInformationFormat="3"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

 			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/gtest_env_var_test_.exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

+				Name="VCLibrarianTool"

+				OutputFile="$(OutDir)/$(ProjectName).lib"/>

 			<Tool

 				Name="VCMIDLTool"/>

 			<Tool

@@ -98,8 +87,6 @@
 			<Tool

 				Name="VCXMLDataGeneratorTool"/>

 			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

 				Name="VCManagedWrapperGeneratorTool"/>

 			<Tool

 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

@@ -107,8 +94,8 @@
 	</Configurations>

 	<References>

 		<ProjectReference

-			ReferencedProjectIdentifier="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"

-			Name="gtest"/>

+			ReferencedProjectIdentifier="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}"

+			Name="gtest-md"/>

 	</References>

 	<Files>

 		<Filter

@@ -116,20 +103,18 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

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

 			<File

-				RelativePath="..\test\gtest_env_var_test_.cc">

+				RelativePath="..\src\gtest_main.cc">

 				<FileConfiguration

 					Name="Debug|Win32">

 					<Tool

 						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"

-						UsePrecompiledHeader="0"/>

+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>

 				</FileConfiguration>

 				<FileConfiguration

 					Name="Release|Win32">

 					<Tool

 						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"

-						UsePrecompiledHeader="0"/>

+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>

 				</FileConfiguration>

 			</File>

 		</Filter>

@@ -137,6 +122,42 @@
 			Name="Header Files"

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

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

+			<File

+				RelativePath="..\include\gtest\internal\gtest-death-test-internal.h">

+			</File>

+			<File

+				RelativePath="..\include\gtest\gtest-death-test.h">

+			</File>

+			<File

+				RelativePath="..\include\gtest\internal\gtest-filepath.h">

+			</File>

+			<File

+				RelativePath="..\src\gtest-internal-inl.h">

+			</File>

+			<File

+				RelativePath="..\include\gtest\internal\gtest-internal.h">

+			</File>

+			<File

+				RelativePath="..\include\gtest\gtest-message.h">

+			</File>

+			<File

+				RelativePath="..\include\gtest\internal\gtest-port.h">

+			</File>

+			<File

+				RelativePath="..\include\gtest\gtest-spi.h">

+			</File>

+			<File

+				RelativePath="..\include\gtest\internal\gtest-string.h">

+			</File>

+			<File

+				RelativePath="..\include\gtest\gtest.h">

+			</File>

+			<File

+				RelativePath="..\include\gtest\gtest_pred_impl.h">

+			</File>

+			<File

+				RelativePath="..\include\gtest\gtest_prod.h">

+			</File>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/gtest/msvc/gtest_main.vcproj b/gtest/msvc/gtest_main.vcproj
index db2f617..1c8c58e 100644
--- a/gtest/msvc/gtest_main.vcproj
+++ b/gtest/msvc/gtest_main.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory="Debug"

-			IntermediateDirectory="Debug"

+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)/$(ProjectName)"

 			ConfigurationType="4"

 			CharacterSet="2"

 			ReferencesPath="">

@@ -26,7 +26,7 @@
 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

+				Detect64BitPortabilityProblems="FALSE"

 				DebugInformationFormat="4"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

@@ -54,8 +54,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="Release"

+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)/$(ProjectName)"

 			ConfigurationType="4"

 			CharacterSet="2"

 			ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">

@@ -65,7 +65,7 @@
 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

+				Detect64BitPortabilityProblems="FALSE"

 				DebugInformationFormat="3"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

diff --git a/gtest/msvc/gtest_color_test_.vcproj b/gtest/msvc/gtest_prod_test-md.vcproj
index e5b52ec..05b05d9 100644
--- a/gtest/msvc/gtest_color_test_.vcproj
+++ b/gtest/msvc/gtest_prod_test-md.vcproj
@@ -2,8 +2,8 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="7.10"

-	Name="gtest_color_test_"

-	ProjectGUID="{ABC5A7E8-072C-4A2D-B186-19EA5394B9C6}"

+	Name="gtest_prod_test-md"

+	ProjectGUID="{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}"

 	Keyword="Win32Proj">

 	<Platforms>

 		<Platform

@@ -12,8 +12,8 @@
 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory="Debug"

-			IntermediateDirectory="Debug"

+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)/$(ProjectName)"

 			ConfigurationType="1"

 			CharacterSet="2">

 			<Tool

@@ -25,16 +25,16 @@
 				RuntimeLibrary="3"

 				UsePrecompiledHeader="3"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

+				Detect64BitPortabilityProblems="FALSE"

 				DebugInformationFormat="4"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/gtest_color_test_.exe"

+				OutputFile="$(OutDir)/gtest_prod_test.exe"

 				LinkIncremental="2"

 				GenerateDebugInformation="TRUE"

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

+				ProgramDatabaseFile="$(OutDir)/gtest_prod_test.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

@@ -60,8 +60,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="Release"

+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)/$(ProjectName)"

 			ConfigurationType="1"

 			CharacterSet="2">

 			<Tool

@@ -70,13 +70,13 @@
 				RuntimeLibrary="2"

 				UsePrecompiledHeader="3"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

+				Detect64BitPortabilityProblems="FALSE"

 				DebugInformationFormat="3"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/gtest_color_test_.exe"

+				OutputFile="$(OutDir)/gtest_prod_test.exe"

 				LinkIncremental="1"

 				GenerateDebugInformation="TRUE"

 				SubSystem="1"

@@ -107,8 +107,8 @@
 	</Configurations>

 	<References>

 		<ProjectReference

-			ReferencedProjectIdentifier="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"

-			Name="gtest"/>

+			ReferencedProjectIdentifier="{3AF54C8A-10BF-4332-9147-F68ED9862033}"

+			Name="gtest_main-md"/>

 	</References>

 	<Files>

 		<Filter

@@ -116,7 +116,24 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

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

 			<File

-				RelativePath="..\test\gtest_color_test_.cc">

+				RelativePath="..\test\gtest_prod_test.cc">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"

+						UsePrecompiledHeader="0"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"

+						UsePrecompiledHeader="0"/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\test\production.cc">

 				<FileConfiguration

 					Name="Debug|Win32">

 					<Tool

@@ -137,6 +154,9 @@
 			Name="Header Files"

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

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

+			<File

+				RelativePath="..\test\production.h">

+			</File>

 		</Filter>

 	</Files>

 	<Globals>

diff --git a/gtest/msvc/gtest_prod_test.vcproj b/gtest/msvc/gtest_prod_test.vcproj
index 9e31611..d1f6345 100644
--- a/gtest/msvc/gtest_prod_test.vcproj
+++ b/gtest/msvc/gtest_prod_test.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory="Debug"

-			IntermediateDirectory="Debug"

+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)/$(ProjectName)"

 			ConfigurationType="1"

 			CharacterSet="2">

 			<Tool

@@ -25,7 +25,7 @@
 				RuntimeLibrary="3"

 				UsePrecompiledHeader="3"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

+				Detect64BitPortabilityProblems="FALSE"

 				DebugInformationFormat="4"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

@@ -60,8 +60,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="Release"

+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)/$(ProjectName)"

 			ConfigurationType="1"

 			CharacterSet="2">

 			<Tool

@@ -70,7 +70,7 @@
 				RuntimeLibrary="2"

 				UsePrecompiledHeader="3"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

+				Detect64BitPortabilityProblems="FALSE"

 				DebugInformationFormat="3"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

diff --git a/gtest/msvc/gtest_uninitialized_test_.vcproj b/gtest/msvc/gtest_uninitialized_test_.vcproj
deleted file mode 100644
index b6c1e71..0000000
--- a/gtest/msvc/gtest_uninitialized_test_.vcproj
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="gtest_uninitialized_test_"

-	ProjectGUID="{42B8A077-E162-4540-A688-246296ACAC1D}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="Debug"

-			IntermediateDirectory="Debug"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="3"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/gtest_uninitialized_test_.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/gtest_uninitialized_test_.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="Release"

-			IntermediateDirectory="Release"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="2"

-				UsePrecompiledHeader="3"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/gtest_uninitialized_test_.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>

-		<ProjectReference

-			ReferencedProjectIdentifier="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"

-			Name="gtest"/>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

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

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

-			<File

-				RelativePath="..\test\gtest_uninitialized_test_.cc">

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"

-						UsePrecompiledHeader="0"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"

-						UsePrecompiledHeader="0"/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

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

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

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/gtest/msvc/gtest_output_test_.vcproj b/gtest/msvc/gtest_unittest-md.vcproj
index 6c73796..38a5e56 100644
--- a/gtest/msvc/gtest_output_test_.vcproj
+++ b/gtest/msvc/gtest_unittest-md.vcproj
@@ -2,8 +2,8 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="7.10"

-	Name="gtest_output_test_"

-	ProjectGUID="{A4903F73-ED6C-4972-863E-F7355EB0145E}"

+	Name="gtest_unittest-md"

+	ProjectGUID="{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}"

 	Keyword="Win32Proj">

 	<Platforms>

 		<Platform

@@ -12,8 +12,8 @@
 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory="Debug"

-			IntermediateDirectory="Debug"

+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)/$(ProjectName)"

 			ConfigurationType="1"

 			CharacterSet="2">

 			<Tool

@@ -25,16 +25,16 @@
 				RuntimeLibrary="3"

 				UsePrecompiledHeader="3"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

+				Detect64BitPortabilityProblems="FALSE"

 				DebugInformationFormat="4"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/gtest_output_test_.exe"

+				OutputFile="$(OutDir)/gtest_unittest.exe"

 				LinkIncremental="2"

 				GenerateDebugInformation="TRUE"

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

+				ProgramDatabaseFile="$(OutDir)/gtest_unittest.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

@@ -60,8 +60,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="Release"

+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)/$(ProjectName)"

 			ConfigurationType="1"

 			CharacterSet="2">

 			<Tool

@@ -70,13 +70,13 @@
 				RuntimeLibrary="2"

 				UsePrecompiledHeader="3"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

+				Detect64BitPortabilityProblems="FALSE"

 				DebugInformationFormat="3"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/gtest_output_test_.exe"

+				OutputFile="$(OutDir)/gtest_unittest.exe"

 				LinkIncremental="1"

 				GenerateDebugInformation="TRUE"

 				SubSystem="1"

@@ -107,8 +107,8 @@
 	</Configurations>

 	<References>

 		<ProjectReference

-			ReferencedProjectIdentifier="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"

-			Name="gtest"/>

+			ReferencedProjectIdentifier="{3AF54C8A-10BF-4332-9147-F68ED9862033}"

+			Name="gtest_main-md"/>

 	</References>

 	<Files>

 		<Filter

@@ -116,7 +116,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

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

 			<File

-				RelativePath="..\test\gtest_output_test_.cc">

+				RelativePath="..\test\gtest_unittest.cc">

 				<FileConfiguration

 					Name="Debug|Win32">

 					<Tool

diff --git a/gtest/msvc/gtest_unittest.vcproj b/gtest/msvc/gtest_unittest.vcproj
index 9350bef..3c8769e 100644
--- a/gtest/msvc/gtest_unittest.vcproj
+++ b/gtest/msvc/gtest_unittest.vcproj
@@ -12,8 +12,8 @@
 	<Configurations>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory="Debug"

-			IntermediateDirectory="Debug"

+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)/$(ProjectName)"

 			ConfigurationType="1"

 			CharacterSet="2">

 			<Tool

@@ -25,7 +25,7 @@
 				RuntimeLibrary="3"

 				UsePrecompiledHeader="3"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

+				Detect64BitPortabilityProblems="FALSE"

 				DebugInformationFormat="4"/>

 			<Tool

 				Name="VCCustomBuildTool"/>

@@ -60,8 +60,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="Release"

+			OutputDirectory="$(SolutionName)/$(ConfigurationName)"

+			IntermediateDirectory="$(OutDir)/$(ProjectName)"

 			ConfigurationType="1"

 			CharacterSet="2">

 			<Tool

@@ -70,7 +70,7 @@
 				RuntimeLibrary="2"

 				UsePrecompiledHeader="3"

 				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

+				Detect64BitPortabilityProblems="FALSE"

 				DebugInformationFormat="3"/>

 			<Tool

 				Name="VCCustomBuildTool"/>