]> git.saurik.com Git - wxWidgets.git/blobdiff - tests/benchmarks/bench.vcproj
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added wxCANCEL_DEFAULT style to wxMessageDialog (only implemented for MSW for now...
[wxWidgets.git] / tests / benchmarks / bench.vcproj
diff --git a/tests/benchmarks/bench.vcproj b/tests/benchmarks/bench.vcproj
index 87ae5dab7e180132c973ec3b4ac22ce772f6dda9..943cc29ad0be275ccd3bd3c421beb1df0ed0fdb0 100644 (file)
--- a/tests/benchmarks/bench.vcproj
+++ b/tests/benchmarks/bench.vcproj
@@ -8,37 +8,48 @@
 -->\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
 -->\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="7.10"\r
+       Version="8.00"\r
        Name="bench"\r
        Name="bench"\r
-       ProjectGUID="{205F8D16-BA71-560B-A3DF-7A2A93B16CF6}">\r
+       ProjectGUID="{205F8D16-BA71-560B-A3DF-7A2A93B16CF6}"\r
+       >\r
        <Platforms>\r
                <Platform\r
        <Platforms>\r
                <Platform\r
-                       Name="Win32"/>\r
+                       Name="Win32"\r
+               />\r
        </Platforms>\r
        </Platforms>\r
+       <ToolFiles>\r
+               \r
+       </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
                        Name="DLL Universal Release|Win32"\r
        <Configurations>\r
                <Configuration\r
                        Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc7_mswunivudll"\r
-                       IntermediateDirectory="vc7_mswunivudll\bench"\r
+                       OutputDirectory="vc_mswunivudll"\r
+                       IntermediateDirectory="vc_mswunivudll\bench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1">\r
+                       CharacterSet="1"\r
+                       >\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCIDLTool"/>\r
+                               Name="VCIDLTool"\r
+                       />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc7_dll\mswunivu;.\..\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
                                MinimalRebuild="false"\r
                                ExceptionHandling="1"\r
                                AdditionalOptions=""\r
                                MinimalRebuild="false"\r
                                ExceptionHandling="1"\r
                                AdditionalOptions=""\r
@@ -48,72 +59,91 @@
                                DebugInformationFormat="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
                                DebugInformationFormat="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc7_mswunivudll\bench\"\r
-                               ObjectFile="vc7_mswunivudll\bench\"\r
-                               ProgramDataBaseFileName="vc7_mswunivudll\bench.pdb"\r
+                               AssemblerListingLocation="vc_mswunivudll\bench\"\r
+                               ObjectFile="vc_mswunivudll\bench\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\bench.pdb"\r
                                WarningLevel="4"\r
                                WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="true"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Culture="1033"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc7_dll\mswunivu;.\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                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"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                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"\r
                                AdditionalOptions=""\r
-                               OutputFile="vc7_mswunivudll\bench.exe"\r
+                               OutputFile="vc_mswunivudll\bench.exe"\r
                                LinkIncremental="2"\r
                                SubSystem="1"\r
                                SuppressStartupBanner="true"\r
                                LinkIncremental="2"\r
                                SubSystem="1"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc7_dll"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc7_mswunivudll\bench.pdb"\r
-                               TargetMachine="1"/>\r
+                               ProgramDatabaseFile="vc_mswunivudll\bench.pdb"\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc7_mswunivudll\bench.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               OutputFile="vc_mswunivudll\bench.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="DLL Universal Debug|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc7_mswunivuddll"\r
-                       IntermediateDirectory="vc7_mswunivuddll\bench"\r
+                       OutputDirectory="vc_mswunivuddll"\r
+                       IntermediateDirectory="vc_mswunivuddll\bench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1">\r
+                       CharacterSet="1"\r
+                       >\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCIDLTool"/>\r
+                               Name="VCIDLTool"\r
+                       />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                InlineFunctionExpansion="1"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc7_dll\mswunivud;.\..\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                AdditionalOptions=""\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                AdditionalOptions=""\r
@@ -123,72 +153,91 @@
                                DebugInformationFormat="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
                                DebugInformationFormat="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc7_mswunivuddll\bench\"\r
-                               ObjectFile="vc7_mswunivuddll\bench\"\r
-                               ProgramDataBaseFileName="vc7_mswunivuddll\bench.pdb"\r
+                               AssemblerListingLocation="vc_mswunivuddll\bench\"\r
+                               ObjectFile="vc_mswunivuddll\bench\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\bench.pdb"\r
                                WarningLevel="4"\r
                                WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="true"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Culture="1033"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc7_dll\mswunivud;.\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                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"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                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"\r
                                AdditionalOptions=""\r
-                               OutputFile="vc7_mswunivuddll\bench.exe"\r
+                               OutputFile="vc_mswunivuddll\bench.exe"\r
                                LinkIncremental="2"\r
                                SubSystem="1"\r
                                SuppressStartupBanner="true"\r
                                LinkIncremental="2"\r
                                SubSystem="1"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc7_dll"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc7_mswunivuddll\bench.pdb"\r
-                               TargetMachine="1"/>\r
+                               ProgramDatabaseFile="vc_mswunivuddll\bench.pdb"\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc7_mswunivuddll\bench.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               OutputFile="vc_mswunivuddll\bench.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="DLL Release|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="DLL Release|Win32"\r
-                       OutputDirectory="vc7_mswudll"\r
-                       IntermediateDirectory="vc7_mswudll\bench"\r
+                       OutputDirectory="vc_mswudll"\r
+                       IntermediateDirectory="vc_mswudll\bench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1">\r
+                       CharacterSet="1"\r
+                       >\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCIDLTool"/>\r
+                               Name="VCIDLTool"\r
+                       />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc7_dll\mswu;.\..\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
                                MinimalRebuild="false"\r
                                ExceptionHandling="1"\r
                                AdditionalOptions=""\r
                                MinimalRebuild="false"\r
                                ExceptionHandling="1"\r
                                AdditionalOptions=""\r
@@ -198,72 +247,91 @@
                                DebugInformationFormat="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
                                DebugInformationFormat="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc7_mswudll\bench\"\r
-                               ObjectFile="vc7_mswudll\bench\"\r
-                               ProgramDataBaseFileName="vc7_mswudll\bench.pdb"\r
+                               AssemblerListingLocation="vc_mswudll\bench\"\r
+                               ObjectFile="vc_mswudll\bench\"\r
+                               ProgramDataBaseFileName="vc_mswudll\bench.pdb"\r
                                WarningLevel="4"\r
                                WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="true"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Culture="1033"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc7_dll\mswu;.\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                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"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                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"\r
                                AdditionalOptions=""\r
-                               OutputFile="vc7_mswudll\bench.exe"\r
+                               OutputFile="vc_mswudll\bench.exe"\r
                                LinkIncremental="2"\r
                                SubSystem="1"\r
                                SuppressStartupBanner="true"\r
                                LinkIncremental="2"\r
                                SubSystem="1"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc7_dll"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc7_mswudll\bench.pdb"\r
-                               TargetMachine="1"/>\r
+                               ProgramDatabaseFile="vc_mswudll\bench.pdb"\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc7_mswudll\bench.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               OutputFile="vc_mswudll\bench.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc7_mswuddll"\r
-                       IntermediateDirectory="vc7_mswuddll\bench"\r
+                       OutputDirectory="vc_mswuddll"\r
+                       IntermediateDirectory="vc_mswuddll\bench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1">\r
+                       CharacterSet="1"\r
+                       >\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCIDLTool"/>\r
+                               Name="VCIDLTool"\r
+                       />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                InlineFunctionExpansion="1"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc7_dll\mswud;.\..\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                AdditionalOptions=""\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                AdditionalOptions=""\r
@@ -273,72 +341,91 @@
                                DebugInformationFormat="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
                                DebugInformationFormat="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc7_mswuddll\bench\"\r
-                               ObjectFile="vc7_mswuddll\bench\"\r
-                               ProgramDataBaseFileName="vc7_mswuddll\bench.pdb"\r
+                               AssemblerListingLocation="vc_mswuddll\bench\"\r
+                               ObjectFile="vc_mswuddll\bench\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\bench.pdb"\r
                                WarningLevel="4"\r
                                WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="true"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Culture="1033"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc7_dll\mswud;.\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                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"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                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"\r
                                AdditionalOptions=""\r
-                               OutputFile="vc7_mswuddll\bench.exe"\r
+                               OutputFile="vc_mswuddll\bench.exe"\r
                                LinkIncremental="2"\r
                                SubSystem="1"\r
                                SuppressStartupBanner="true"\r
                                LinkIncremental="2"\r
                                SubSystem="1"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc7_dll"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc7_mswuddll\bench.pdb"\r
-                               TargetMachine="1"/>\r
+                               ProgramDatabaseFile="vc_mswuddll\bench.pdb"\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc7_mswuddll\bench.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               OutputFile="vc_mswuddll\bench.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Universal Release|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="Universal Release|Win32"\r
-                       OutputDirectory="vc7_mswunivu"\r
-                       IntermediateDirectory="vc7_mswunivu\bench"\r
+                       OutputDirectory="vc_mswunivu"\r
+                       IntermediateDirectory="vc_mswunivu\bench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1">\r
+                       CharacterSet="1"\r
+                       >\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCIDLTool"/>\r
+                               Name="VCIDLTool"\r
+                       />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc7_lib\mswunivu;.\..\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
                                MinimalRebuild="false"\r
                                ExceptionHandling="1"\r
                                AdditionalOptions=""\r
                                MinimalRebuild="false"\r
                                ExceptionHandling="1"\r
                                AdditionalOptions=""\r
@@ -348,72 +435,91 @@
                                DebugInformationFormat="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
                                DebugInformationFormat="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc7_mswunivu\bench\"\r
-                               ObjectFile="vc7_mswunivu\bench\"\r
-                               ProgramDataBaseFileName="vc7_mswunivu\bench.pdb"\r
+                               AssemblerListingLocation="vc_mswunivu\bench\"\r
+                               ObjectFile="vc_mswunivu\bench\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\bench.pdb"\r
                                WarningLevel="4"\r
                                WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="true"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Culture="1033"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc7_lib\mswunivu;.\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                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"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                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"\r
                                AdditionalOptions=""\r
-                               OutputFile="vc7_mswunivu\bench.exe"\r
+                               OutputFile="vc_mswunivu\bench.exe"\r
                                LinkIncremental="2"\r
                                SubSystem="1"\r
                                SuppressStartupBanner="true"\r
                                LinkIncremental="2"\r
                                SubSystem="1"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc7_lib"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc7_mswunivu\bench.pdb"\r
-                               TargetMachine="1"/>\r
+                               ProgramDatabaseFile="vc_mswunivu\bench.pdb"\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc7_mswunivu\bench.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               OutputFile="vc_mswunivu\bench.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Universal Debug|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc7_mswunivud"\r
-                       IntermediateDirectory="vc7_mswunivud\bench"\r
+                       OutputDirectory="vc_mswunivud"\r
+                       IntermediateDirectory="vc_mswunivud\bench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1">\r
+                       CharacterSet="1"\r
+                       >\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCIDLTool"/>\r
+                               Name="VCIDLTool"\r
+                       />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                InlineFunctionExpansion="1"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc7_lib\mswunivud;.\..\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                AdditionalOptions=""\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                AdditionalOptions=""\r
@@ -423,72 +529,91 @@
                                DebugInformationFormat="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
                                DebugInformationFormat="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc7_mswunivud\bench\"\r
-                               ObjectFile="vc7_mswunivud\bench\"\r
-                               ProgramDataBaseFileName="vc7_mswunivud\bench.pdb"\r
+                               AssemblerListingLocation="vc_mswunivud\bench\"\r
+                               ObjectFile="vc_mswunivud\bench\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\bench.pdb"\r
                                WarningLevel="4"\r
                                WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="true"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Culture="1033"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc7_lib\mswunivud;.\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                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"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                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"\r
                                AdditionalOptions=""\r
-                               OutputFile="vc7_mswunivud\bench.exe"\r
+                               OutputFile="vc_mswunivud\bench.exe"\r
                                LinkIncremental="2"\r
                                SubSystem="1"\r
                                SuppressStartupBanner="true"\r
                                LinkIncremental="2"\r
                                SubSystem="1"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc7_lib"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc7_mswunivud\bench.pdb"\r
-                               TargetMachine="1"/>\r
+                               ProgramDatabaseFile="vc_mswunivud\bench.pdb"\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc7_mswunivud\bench.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               OutputFile="vc_mswunivud\bench.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="vc7_mswu"\r
-                       IntermediateDirectory="vc7_mswu\bench"\r
+                       OutputDirectory="vc_mswu"\r
+                       IntermediateDirectory="vc_mswu\bench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1">\r
+                       CharacterSet="1"\r
+                       >\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCIDLTool"/>\r
+                               Name="VCIDLTool"\r
+                       />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc7_lib\mswu;.\..\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
                                MinimalRebuild="false"\r
                                ExceptionHandling="1"\r
                                AdditionalOptions=""\r
                                MinimalRebuild="false"\r
                                ExceptionHandling="1"\r
                                AdditionalOptions=""\r
@@ -498,72 +623,91 @@
                                DebugInformationFormat="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
                                DebugInformationFormat="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc7_mswu\bench\"\r
-                               ObjectFile="vc7_mswu\bench\"\r
-                               ProgramDataBaseFileName="vc7_mswu\bench.pdb"\r
+                               AssemblerListingLocation="vc_mswu\bench\"\r
+                               ObjectFile="vc_mswu\bench\"\r
+                               ProgramDataBaseFileName="vc_mswu\bench.pdb"\r
                                WarningLevel="4"\r
                                WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="true"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Culture="1033"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc7_lib\mswu;.\..\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                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"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                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"\r
                                AdditionalOptions=""\r
-                               OutputFile="vc7_mswu\bench.exe"\r
+                               OutputFile="vc_mswu\bench.exe"\r
                                LinkIncremental="2"\r
                                SubSystem="1"\r
                                SuppressStartupBanner="true"\r
                                LinkIncremental="2"\r
                                SubSystem="1"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc7_lib"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc7_mswu\bench.pdb"\r
-                               TargetMachine="1"/>\r
+                               ProgramDatabaseFile="vc_mswu\bench.pdb"\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc7_mswu\bench.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               OutputFile="vc_mswu\bench.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="vc7_mswud"\r
-                       IntermediateDirectory="vc7_mswud\bench"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\bench"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1">\r
+                       CharacterSet="1"\r
+                       >\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCIDLTool"/>\r
+                               Name="VCIDLTool"\r
+                       />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                InlineFunctionExpansion="1"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc7_lib\mswud;.\..\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                AdditionalOptions=""\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                AdditionalOptions=""\r
@@ -573,48 +717,61 @@
                                DebugInformationFormat="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
                                DebugInformationFormat="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc7_mswud\bench\"\r
-                               ObjectFile="vc7_mswud\bench\"\r
-                               ProgramDataBaseFileName="vc7_mswud\bench.pdb"\r
+                               AssemblerListingLocation="vc_mswud\bench\"\r
+                               ObjectFile="vc_mswud\bench\"\r
+                               ProgramDataBaseFileName="vc_mswud\bench.pdb"\r
                                WarningLevel="4"\r
                                WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="true"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Culture="1033"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\..\lib\vc7_lib\mswud;.\..\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>\r
+                               AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                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"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                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"\r
                                AdditionalOptions=""\r
-                               OutputFile="vc7_mswud\bench.exe"\r
+                               OutputFile="vc_mswud\bench.exe"\r
                                LinkIncremental="2"\r
                                SubSystem="1"\r
                                SuppressStartupBanner="true"\r
                                LinkIncremental="2"\r
                                SubSystem="1"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\..\lib\vc7_lib"\r
+                               AdditionalLibraryDirectories=".\..\..\lib\vc_lib"\r
+                               GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc7_mswud\bench.pdb"\r
-                               TargetMachine="1"/>\r
+                               ProgramDatabaseFile="vc_mswud\bench.pdb"\r
+                               TargetMachine="1"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCALinkTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc7_mswud\bench.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               OutputFile="vc_mswud\bench.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCFxCopTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
                        <Tool\r
                        <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
                </Configuration>\r
        </Configurations>\r
        <References>\r
                </Configuration>\r
        </Configurations>\r
        <References>\r
@@ -624,17 +781,23 @@
                <Filter\r
                        Name="Source Files"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                <Filter\r
                        Name="Source Files"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       >\r
                        <File\r
                        <File\r
-                               RelativePath=".\bench.cpp"/>\r
+                               RelativePath=".\bench.cpp"\r
+                       />\r
                        <File\r
                        <File\r
-                               RelativePath=".\htmlparser\htmlpars.cpp"/>\r
+                               RelativePath=".\htmlparser\htmlpars.cpp"\r
+                       />\r
                        <File\r
                        <File\r
-                               RelativePath=".\htmlparser\htmltag.cpp"/>\r
+                               RelativePath=".\htmlparser\htmltag.cpp"\r
+                       />\r
                        <File\r
                        <File\r
-                               RelativePath=".\strings.cpp"/>\r
+                               RelativePath=".\strings.cpp"\r
+                       />\r
                        <File\r
                        <File\r
-                               RelativePath=".\tls.cpp"/>\r
+                               RelativePath=".\tls.cpp"\r
+                       />\r
                </Filter>\r
        </Files>\r
        <Globals>\r
                </Filter>\r
        </Files>\r
        <Globals>\r
wxWidgets (Impactor)