X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/49f11e84829d4045fdaea5b5986994f87c1d27c0..c9d13e86a698164843715665624ccb929e37255c:/tests/benchmarks/bench.vcproj

diff --git a/tests/benchmarks/bench.vcproj b/tests/benchmarks/bench.vcproj
index dc6e68e116..87ae5dab7e 100644
--- a/tests/benchmarks/bench.vcproj
+++ b/tests/benchmarks/bench.vcproj
@@ -8,48 +8,37 @@
 -->
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="7.10"
 	Name="bench"
-	ProjectGUID="{205F8D16-BA71-560B-A3DF-7A2A93B16CF6}"
-	>
+	ProjectGUID="{205F8D16-BA71-560B-A3DF-7A2A93B16CF6}">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			Name="Win32"/>
 	</Platforms>
-	<ToolFiles>
-		
-	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="DLL Universal Release|Win32"
-			OutputDirectory="vc_mswunivudll"
-			IntermediateDirectory="vc_mswunivudll\bench"
+			OutputDirectory="vc7_mswunivudll"
+			IntermediateDirectory="vc7_mswunivudll\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCIDLTool"
-			/>
+				Name="VCIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
+				AdditionalIncludeDirectories=".\..\..\lib\vc7_dll\mswunivu;.\..\..\include;."
 				MinimalRebuild="false"
 				ExceptionHandling="1"
 				AdditionalOptions=""
@@ -59,91 +48,72 @@
 				DebugInformationFormat="3"
 				Detect64BitPortabilityProblems="true"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivudll\bench\"
-				ObjectFile="vc_mswunivudll\bench\"
-				ProgramDataBaseFileName="vc_mswunivudll\bench.pdb"
+				AssemblerListingLocation="vc7_mswunivudll\bench\"
+				ObjectFile="vc7_mswunivudll\bench\"
+				ProgramDataBaseFileName="vc7_mswunivudll\bench.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"
-			/>
+				SuppressStartupBanner="true"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-			/>
+				AdditionalIncludeDirectories=".\..\..\lib\vc7_dll\mswunivu;.\..\..\include;."
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
 				AdditionalOptions=""
-				OutputFile="vc_mswunivudll\bench.exe"
+				OutputFile="vc7_mswunivudll\bench.exe"
 				LinkIncremental="2"
 				SubSystem="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
-				GenerateManifest="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc7_dll"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswunivudll\bench.pdb"
-				TargetMachine="1"
-			/>
+				ProgramDatabaseFile="vc7_mswunivudll\bench.pdb"
+				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivudll\bench.bsc"
-				SuppressStartupBanner="true"
-			/>
+				OutputFile="vc7_mswunivudll\bench.bsc"
+				SuppressStartupBanner="true"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCAppVerifierTool"/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 		</Configuration>
 		<Configuration
 			Name="DLL Universal Debug|Win32"
-			OutputDirectory="vc_mswunivuddll"
-			IntermediateDirectory="vc_mswunivuddll\bench"
+			OutputDirectory="vc7_mswunivuddll"
+			IntermediateDirectory="vc7_mswunivuddll\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCIDLTool"
-			/>
+				Name="VCIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
+				AdditionalIncludeDirectories=".\..\..\lib\vc7_dll\mswunivud;.\..\..\include;."
 				MinimalRebuild="true"
 				ExceptionHandling="1"
 				AdditionalOptions=""
@@ -153,91 +123,72 @@
 				DebugInformationFormat="3"
 				Detect64BitPortabilityProblems="true"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivuddll\bench\"
-				ObjectFile="vc_mswunivuddll\bench\"
-				ProgramDataBaseFileName="vc_mswunivuddll\bench.pdb"
+				AssemblerListingLocation="vc7_mswunivuddll\bench\"
+				ObjectFile="vc7_mswunivuddll\bench\"
+				ProgramDataBaseFileName="vc7_mswunivuddll\bench.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"
-			/>
+				SuppressStartupBanner="true"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-			/>
+				AdditionalIncludeDirectories=".\..\..\lib\vc7_dll\mswunivud;.\..\..\include;."
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
 				AdditionalOptions=""
-				OutputFile="vc_mswunivuddll\bench.exe"
+				OutputFile="vc7_mswunivuddll\bench.exe"
 				LinkIncremental="2"
 				SubSystem="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
-				GenerateManifest="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc7_dll"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswunivuddll\bench.pdb"
-				TargetMachine="1"
-			/>
+				ProgramDatabaseFile="vc7_mswunivuddll\bench.pdb"
+				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivuddll\bench.bsc"
-				SuppressStartupBanner="true"
-			/>
+				OutputFile="vc7_mswunivuddll\bench.bsc"
+				SuppressStartupBanner="true"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCAppVerifierTool"/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 		</Configuration>
 		<Configuration
 			Name="DLL Release|Win32"
-			OutputDirectory="vc_mswudll"
-			IntermediateDirectory="vc_mswudll\bench"
+			OutputDirectory="vc7_mswudll"
+			IntermediateDirectory="vc7_mswudll\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCIDLTool"
-			/>
+				Name="VCIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
+				AdditionalIncludeDirectories=".\..\..\lib\vc7_dll\mswu;.\..\..\include;."
 				MinimalRebuild="false"
 				ExceptionHandling="1"
 				AdditionalOptions=""
@@ -247,91 +198,72 @@
 				DebugInformationFormat="3"
 				Detect64BitPortabilityProblems="true"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswudll\bench\"
-				ObjectFile="vc_mswudll\bench\"
-				ProgramDataBaseFileName="vc_mswudll\bench.pdb"
+				AssemblerListingLocation="vc7_mswudll\bench\"
+				ObjectFile="vc7_mswudll\bench\"
+				ProgramDataBaseFileName="vc7_mswudll\bench.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"
-			/>
+				SuppressStartupBanner="true"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-			/>
+				AdditionalIncludeDirectories=".\..\..\lib\vc7_dll\mswu;.\..\..\include;."
+				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
 				AdditionalOptions=""
-				OutputFile="vc_mswudll\bench.exe"
+				OutputFile="vc7_mswudll\bench.exe"
 				LinkIncremental="2"
 				SubSystem="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
-				GenerateManifest="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc7_dll"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll\bench.pdb"
-				TargetMachine="1"
-			/>
+				ProgramDatabaseFile="vc7_mswudll\bench.pdb"
+				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswudll\bench.bsc"
-				SuppressStartupBanner="true"
-			/>
+				OutputFile="vc7_mswudll\bench.bsc"
+				SuppressStartupBanner="true"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCAppVerifierTool"/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|Win32"
-			OutputDirectory="vc_mswuddll"
-			IntermediateDirectory="vc_mswuddll\bench"
+			OutputDirectory="vc7_mswuddll"
+			IntermediateDirectory="vc7_mswuddll\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCIDLTool"
-			/>
+				Name="VCIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
+				AdditionalIncludeDirectories=".\..\..\lib\vc7_dll\mswud;.\..\..\include;."
 				MinimalRebuild="true"
 				ExceptionHandling="1"
 				AdditionalOptions=""
@@ -341,91 +273,72 @@
 				DebugInformationFormat="3"
 				Detect64BitPortabilityProblems="true"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswuddll\bench\"
-				ObjectFile="vc_mswuddll\bench\"
-				ProgramDataBaseFileName="vc_mswuddll\bench.pdb"
+				AssemblerListingLocation="vc7_mswuddll\bench\"
+				ObjectFile="vc7_mswuddll\bench\"
+				ProgramDataBaseFileName="vc7_mswuddll\bench.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"
-			/>
+				SuppressStartupBanner="true"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
-			/>
+				AdditionalIncludeDirectories=".\..\..\lib\vc7_dll\mswud;.\..\..\include;."
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
 				AdditionalOptions=""
-				OutputFile="vc_mswuddll\bench.exe"
+				OutputFile="vc7_mswuddll\bench.exe"
 				LinkIncremental="2"
 				SubSystem="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
-				GenerateManifest="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc7_dll"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll\bench.pdb"
-				TargetMachine="1"
-			/>
+				ProgramDatabaseFile="vc7_mswuddll\bench.pdb"
+				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswuddll\bench.bsc"
-				SuppressStartupBanner="true"
-			/>
+				OutputFile="vc7_mswuddll\bench.bsc"
+				SuppressStartupBanner="true"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCAppVerifierTool"/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 		</Configuration>
 		<Configuration
 			Name="Universal Release|Win32"
-			OutputDirectory="vc_mswunivu"
-			IntermediateDirectory="vc_mswunivu\bench"
+			OutputDirectory="vc7_mswunivu"
+			IntermediateDirectory="vc7_mswunivu\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCIDLTool"
-			/>
+				Name="VCIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
+				AdditionalIncludeDirectories=".\..\..\lib\vc7_lib\mswunivu;.\..\..\include;."
 				MinimalRebuild="false"
 				ExceptionHandling="1"
 				AdditionalOptions=""
@@ -435,91 +348,72 @@
 				DebugInformationFormat="3"
 				Detect64BitPortabilityProblems="true"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivu\bench\"
-				ObjectFile="vc_mswunivu\bench\"
-				ProgramDataBaseFileName="vc_mswunivu\bench.pdb"
+				AssemblerListingLocation="vc7_mswunivu\bench\"
+				ObjectFile="vc7_mswunivu\bench\"
+				ProgramDataBaseFileName="vc7_mswunivu\bench.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"
-			/>
+				SuppressStartupBanner="true"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-			/>
+				AdditionalIncludeDirectories=".\..\..\lib\vc7_lib\mswunivu;.\..\..\include;."
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
 				AdditionalOptions=""
-				OutputFile="vc_mswunivu\bench.exe"
+				OutputFile="vc7_mswunivu\bench.exe"
 				LinkIncremental="2"
 				SubSystem="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
-				GenerateManifest="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc7_lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswunivu\bench.pdb"
-				TargetMachine="1"
-			/>
+				ProgramDatabaseFile="vc7_mswunivu\bench.pdb"
+				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivu\bench.bsc"
-				SuppressStartupBanner="true"
-			/>
+				OutputFile="vc7_mswunivu\bench.bsc"
+				SuppressStartupBanner="true"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCAppVerifierTool"/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 		</Configuration>
 		<Configuration
 			Name="Universal Debug|Win32"
-			OutputDirectory="vc_mswunivud"
-			IntermediateDirectory="vc_mswunivud\bench"
+			OutputDirectory="vc7_mswunivud"
+			IntermediateDirectory="vc7_mswunivud\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCIDLTool"
-			/>
+				Name="VCIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
+				AdditionalIncludeDirectories=".\..\..\lib\vc7_lib\mswunivud;.\..\..\include;."
 				MinimalRebuild="true"
 				ExceptionHandling="1"
 				AdditionalOptions=""
@@ -529,91 +423,72 @@
 				DebugInformationFormat="3"
 				Detect64BitPortabilityProblems="true"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivud\bench\"
-				ObjectFile="vc_mswunivud\bench\"
-				ProgramDataBaseFileName="vc_mswunivud\bench.pdb"
+				AssemblerListingLocation="vc7_mswunivud\bench\"
+				ObjectFile="vc7_mswunivud\bench\"
+				ProgramDataBaseFileName="vc7_mswunivud\bench.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"
-			/>
+				SuppressStartupBanner="true"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-			/>
+				AdditionalIncludeDirectories=".\..\..\lib\vc7_lib\mswunivud;.\..\..\include;."
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
 				AdditionalOptions=""
-				OutputFile="vc_mswunivud\bench.exe"
+				OutputFile="vc7_mswunivud\bench.exe"
 				LinkIncremental="2"
 				SubSystem="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
-				GenerateManifest="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc7_lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswunivud\bench.pdb"
-				TargetMachine="1"
-			/>
+				ProgramDatabaseFile="vc7_mswunivud\bench.pdb"
+				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswunivud\bench.bsc"
-				SuppressStartupBanner="true"
-			/>
+				OutputFile="vc7_mswunivud\bench.bsc"
+				SuppressStartupBanner="true"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCAppVerifierTool"/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="vc_mswu"
-			IntermediateDirectory="vc_mswu\bench"
+			OutputDirectory="vc7_mswu"
+			IntermediateDirectory="vc7_mswu\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCIDLTool"
-			/>
+				Name="VCIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
+				AdditionalIncludeDirectories=".\..\..\lib\vc7_lib\mswu;.\..\..\include;."
 				MinimalRebuild="false"
 				ExceptionHandling="1"
 				AdditionalOptions=""
@@ -623,91 +498,72 @@
 				DebugInformationFormat="3"
 				Detect64BitPortabilityProblems="true"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswu\bench\"
-				ObjectFile="vc_mswu\bench\"
-				ProgramDataBaseFileName="vc_mswu\bench.pdb"
+				AssemblerListingLocation="vc7_mswu\bench\"
+				ObjectFile="vc7_mswu\bench\"
+				ProgramDataBaseFileName="vc7_mswu\bench.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"
-			/>
+				SuppressStartupBanner="true"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-			/>
+				AdditionalIncludeDirectories=".\..\..\lib\vc7_lib\mswu;.\..\..\include;."
+				PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxbase29u.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
 				AdditionalOptions=""
-				OutputFile="vc_mswu\bench.exe"
+				OutputFile="vc7_mswu\bench.exe"
 				LinkIncremental="2"
 				SubSystem="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
-				GenerateManifest="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc7_lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswu\bench.pdb"
-				TargetMachine="1"
-			/>
+				ProgramDatabaseFile="vc7_mswu\bench.pdb"
+				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswu\bench.bsc"
-				SuppressStartupBanner="true"
-			/>
+				OutputFile="vc7_mswu\bench.bsc"
+				SuppressStartupBanner="true"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCAppVerifierTool"/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="vc_mswud"
-			IntermediateDirectory="vc_mswud\bench"
+			OutputDirectory="vc7_mswud"
+			IntermediateDirectory="vc7_mswud\bench"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCIDLTool"
-			/>
+				Name="VCIDLTool"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
+				AdditionalIncludeDirectories=".\..\..\lib\vc7_lib\mswud;.\..\..\include;."
 				MinimalRebuild="true"
 				ExceptionHandling="1"
 				AdditionalOptions=""
@@ -717,61 +573,48 @@
 				DebugInformationFormat="3"
 				Detect64BitPortabilityProblems="true"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswud\bench\"
-				ObjectFile="vc_mswud\bench\"
-				ProgramDataBaseFileName="vc_mswud\bench.pdb"
+				AssemblerListingLocation="vc7_mswud\bench\"
+				ObjectFile="vc7_mswud\bench\"
+				ProgramDataBaseFileName="vc7_mswud\bench.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"
-			/>
+				SuppressStartupBanner="true"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
 				Culture="1033"
-				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
-			/>
+				AdditionalIncludeDirectories=".\..\..\lib\vc7_lib\mswud;.\..\..\include;."
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="wxbase29ud.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"
 				AdditionalOptions=""
-				OutputFile="vc_mswud\bench.exe"
+				OutputFile="vc7_mswud\bench.exe"
 				LinkIncremental="2"
 				SubSystem="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
-				GenerateManifest="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc7_lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswud\bench.pdb"
-				TargetMachine="1"
-			/>
+				ProgramDatabaseFile="vc7_mswud\bench.pdb"
+				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCALinkTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCXDCMakeTool"/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="vc_mswud\bench.bsc"
-				SuppressStartupBanner="true"
-			/>
+				OutputFile="vc7_mswud\bench.bsc"
+				SuppressStartupBanner="true"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCFxCopTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCAppVerifierTool"/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -781,17 +624,17 @@
 		<Filter
 			Name="Source Files"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			>
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+			<File
+				RelativePath=".\bench.cpp"/>
+			<File
+				RelativePath=".\htmlparser\htmlpars.cpp"/>
 			<File
-				RelativePath=".\bench.cpp"
-			/>
+				RelativePath=".\htmlparser\htmltag.cpp"/>
 			<File
-				RelativePath=".\strings.cpp"
-			/>
+				RelativePath=".\strings.cpp"/>
 			<File
-				RelativePath=".\tls.cpp"
-			/>
+				RelativePath=".\tls.cpp"/>
 		</Filter>
 	</Files>
 	<Globals>