Allow selecting the kinds of DC to test in the graphics benchmark too.

[wxWidgets.git] / tests / test_vc7_test.vcproj

diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj
index b483937bfe12648f77ca26a257937a464f590a23..5a0bd705a8dc51003a9005d695690d7fd9f96989 100644 (file)
--- a/tests/test_vc7_test.vcproj
+++ b/tests/test_vc7_test.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <!--\r
 \r
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <!--\r
 \r

-  This makefile was generated by\r
-  Bakefile 0.2.4 (http://www.bakefile.org)\r
+  This project was generated by\r
+  Bakefile 0.2.9 (http://www.bakefile.org)\r

   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r


@@ -17,73 +17,9 @@
        </Platforms>\r
        <Configurations>\r
                <Configuration\r
        </Platforms>\r
        <Configurations>\r
                <Configuration\r

-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc7_mswunivudll"\r
-                       IntermediateDirectory="vc7_mswunivudll\test"\r
-                       ConfigurationType="1"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
-                       CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               UsePrecompiledHeader="3"\r
-                               PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc7_mswunivudll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc7_mswunivudll\test\"\r
-                               ObjectFile="vc7_mswunivudll\test\"\r
-                               ProgramDataBaseFileName="vc7_mswunivudll\test.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.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
-                               OutputFile="vc7_mswunivudll\test.exe"\r
-                               LinkIncremental="2"\r
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc7_dll"\r
-                               GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc7_mswunivudll\test.pdb"\r
-                               SubSystem="1"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivu;.\..\include;."/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc7_mswunivuddll"\r
-                       IntermediateDirectory="vc7_mswunivuddll\test"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\test"\r

                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r


@@ -91,8 +27,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r

                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r


@@ -101,10 +37,9 @@
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r

-                               PrecompiledHeaderFile="vc7_mswunivuddll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc7_mswunivuddll\test\"\r
-                               ObjectFile="vc7_mswunivuddll\test\"\r
-                               ProgramDataBaseFileName="vc7_mswunivuddll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\testprec_test.pch"\r
+                               ObjectFile="vc_mswud\test\"\r
+                               ProgramDataBaseFileName="vc_mswud\test.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -114,17 +49,19 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r

-                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.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
-                               OutputFile="vc7_mswunivuddll\test.exe"\r
+                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud_xml.lib  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 wininet.lib"\r
+                               OutputFile="vc_mswud\test.exe"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r

-                               AdditionalLibraryDirectories=".\..\lib\vc7_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r

                                GenerateDebugInformation="TRUE"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc7_mswunivuddll\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswud\test.pdb"\r

                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>\r

                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r


@@ -133,9 +70,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivud;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>\r

                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r


@@ -148,9 +85,9 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="vc7_mswudll"\r
-                       IntermediateDirectory="vc7_mswudll\test"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="vc_mswu"\r
+                       IntermediateDirectory="vc_mswu\test"\r

                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r


@@ -158,17 +95,16 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r

                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r

-                               PrecompiledHeaderFile="vc7_mswudll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc7_mswudll\test\"\r
-                               ObjectFile="vc7_mswudll\test\"\r
-                               ProgramDataBaseFileName="vc7_mswudll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\testprec_test.pch"\r
+                               ObjectFile="vc_mswu\test\"\r
+                               ProgramDataBaseFileName="vc_mswu\test.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -178,17 +114,21 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r

-                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.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
-                               OutputFile="vc7_mswudll\test.exe"\r
-                               LinkIncremental="2"\r
+                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u_xml.lib  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 wininet.lib"\r
+                               OutputFile="vc_mswu\test.exe"\r
+                               LinkIncremental="1"\r

                                SuppressStartupBanner="TRUE"\r
                                SuppressStartupBanner="TRUE"\r

-                               AdditionalLibraryDirectories=".\..\lib\vc7_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r

                                GenerateDebugInformation="TRUE"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc7_mswudll\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswu\test.pdb"\r

                                SubSystem="1"\r
                                SubSystem="1"\r

-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>\r

                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r


@@ -197,9 +137,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswu;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>\r

                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r


@@ -213,139 +153,8 @@
                </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\test"\r
-                       ConfigurationType="1"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
-                       CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="TRUE"\r
-                               ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               UsePrecompiledHeader="3"\r
-                               PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc7_mswuddll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc7_mswuddll\test\"\r
-                               ObjectFile="vc7_mswuddll\test\"\r
-                               ProgramDataBaseFileName="vc7_mswuddll\test.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.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
-                               OutputFile="vc7_mswuddll\test.exe"\r
-                               LinkIncremental="2"\r
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc7_dll"\r
-                               GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc7_mswuddll\test.pdb"\r
-                               SubSystem="1"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswud;.\..\include;."/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="vc7_mswunivu"\r
-                       IntermediateDirectory="vc7_mswunivu\test"\r
-                       ConfigurationType="1"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
-                       CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               UsePrecompiledHeader="3"\r
-                               PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc7_mswunivu\testprec_test.pch"\r
-                               AssemblerListingLocation="vc7_mswunivu\test\"\r
-                               ObjectFile="vc7_mswunivu\test\"\r
-                               ProgramDataBaseFileName="vc7_mswunivu\test.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.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
-                               OutputFile="vc7_mswunivu\test.exe"\r
-                               LinkIncremental="2"\r
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc7_lib"\r
-                               GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc7_mswunivu\test.pdb"\r
-                               SubSystem="1"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivu;.\..\include;."/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc7_mswunivud"\r
-                       IntermediateDirectory="vc7_mswunivud\test"\r
+                       OutputDirectory="vc_mswuddll"\r
+                       IntermediateDirectory="vc_mswuddll\test"\r

                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r


@@ -353,8 +162,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r


@@ -363,10 +172,9 @@
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r

-                               PrecompiledHeaderFile="vc7_mswunivud\testprec_test.pch"\r
-                               AssemblerListingLocation="vc7_mswunivud\test\"\r
-                               ObjectFile="vc7_mswunivud\test\"\r
-                               ProgramDataBaseFileName="vc7_mswunivud\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"\r
+                               ObjectFile="vc_mswuddll\test\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\test.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -376,17 +184,19 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r

-                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.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
-                               OutputFile="vc7_mswunivud\test.exe"\r
+                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud_xml.lib  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 wininet.lib"\r
+                               OutputFile="vc_mswuddll\test.exe"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r

-                               AdditionalLibraryDirectories=".\..\lib\vc7_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r

                                GenerateDebugInformation="TRUE"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc7_mswunivud\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\test.pdb"\r

                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>\r

                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r


@@ -395,9 +205,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivud;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>\r

                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r


@@ -410,9 +220,9 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r

-                       Name="Release|Win32"\r
-                       OutputDirectory="vc7_mswu"\r
-                       IntermediateDirectory="vc7_mswu\test"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="vc_mswudll"\r
+                       IntermediateDirectory="vc_mswudll\test"\r

                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE"\r


@@ -420,17 +230,16 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r

-                               PrecompiledHeaderFile="vc7_mswu\testprec_test.pch"\r
-                               AssemblerListingLocation="vc7_mswu\test\"\r
-                               ObjectFile="vc7_mswu\test\"\r
-                               ProgramDataBaseFileName="vc7_mswu\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"\r
+                               ObjectFile="vc_mswudll\test\"\r
+                               ProgramDataBaseFileName="vc_mswudll\test.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -440,17 +249,21 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r

-                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.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
-                               OutputFile="vc7_mswu\test.exe"\r
-                               LinkIncremental="2"\r
+                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u_xml.lib  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 wininet.lib"\r
+                               OutputFile="vc_mswudll\test.exe"\r
+                               LinkIncremental="1"\r

                                SuppressStartupBanner="TRUE"\r
                                SuppressStartupBanner="TRUE"\r

-                               AdditionalLibraryDirectories=".\..\lib\vc7_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r

                                GenerateDebugInformation="TRUE"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc7_mswu\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswudll\test.pdb"\r

                                SubSystem="1"\r
                                SubSystem="1"\r

-                               TargetMachine="1"/>\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>\r

                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r


@@ -459,76 +272,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswu;.\..\include;."/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="vc7_mswud"\r
-                       IntermediateDirectory="vc7_mswud\test"\r
-                       ConfigurationType="1"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
-                       CharacterSet="1">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               MinimalRebuild="TRUE"\r
-                               ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               UsePrecompiledHeader="3"\r
-                               PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc7_mswud\testprec_test.pch"\r
-                               AssemblerListingLocation="vc7_mswud\test\"\r
-                               ObjectFile="vc7_mswud\test\"\r
-                               ProgramDataBaseFileName="vc7_mswud\test.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.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
-                               OutputFile="vc7_mswud\test.exe"\r
-                               LinkIncremental="2"\r
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc7_lib"\r
-                               GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="vc7_mswud\test.pdb"\r
-                               SubSystem="1"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswud;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>\r

                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r


@@ -549,6 +295,9 @@
                        Name="Source Files"\r
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
                        Name="Source Files"\r
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r

+                       <File\r
+                               RelativePath=".\any\anytest.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath=".\archive\archivetest.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\archive\archivetest.cpp">\r
                        </File>\r


@@ -579,22 +328,19 @@
                        <File\r
                                RelativePath=".\datetime\datetimetest.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\datetime\datetimetest.cpp">\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\file\dir.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath=".\dummy.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath=".\dummy.cpp">\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32">\r
+                                       Name="Debug|Win32">\r

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32">\r
+                                       Name="Release|Win32">\r

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r


@@ -606,33 +352,30 @@
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Universal Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="DLL Release|Win32">\r

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                        </File>\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\misc\dynamiclib.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\misc\environ.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath=".\weakref\evtconnection.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\weakref\evtconnection.cpp">\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\events\evthandler.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\events\evtsource.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\exec\exec.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath=".\streams\ffilestream.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\streams\ffilestream.cpp">\r
                        </File>\r


@@ -642,6 +385,9 @@
                        <File\r
                                RelativePath=".\config\fileconf.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\config\fileconf.cpp">\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\file\filefn.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath=".\filekind\filekind.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\filekind\filekind.cpp">\r
                        </File>\r


@@ -654,15 +400,27 @@
                        <File\r
                                RelativePath=".\filesys\filesystest.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\filesys\filesystest.cpp">\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\file\filetest.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath=".\fontmap\fontmaptest.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\formatconverter\formatconvertertest.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\fontmap\fontmaptest.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\formatconverter\formatconvertertest.cpp">\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\fswatcher\fswatchertest.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\uris\ftp.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath=".\hashes\hashes.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\hashes\hashes.cpp">\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\interactive\input.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath=".\intl\intltest.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\intl\intltest.cpp">\r
                        </File>\r


@@ -681,6 +439,9 @@
                        <File\r
                                RelativePath=".\lists\lists.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\lists\lists.cpp">\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\log\logtest.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath=".\longlong\longlongtest.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\longlong\longlongtest.cpp">\r
                        </File>\r


@@ -690,12 +451,33 @@
                        <File\r
                                RelativePath=".\streams\memstream.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\streams\memstream.cpp">\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\misc\metatest.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\thread\misc.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath=".\misc\misctests.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\misc\misctests.cpp">\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\misc\module.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\strings\numformatter.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\interactive\output.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\misc\pathlist.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath=".\thread\queue.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\thread\queue.cpp">\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\config\regconf.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath=".\regex\regextest.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\regex\regextest.cpp">\r
                        </File>\r


@@ -711,9 +493,15 @@
                        <File\r
                                RelativePath=".\streams\sstream.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\streams\sstream.cpp">\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\streams\stdstream.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath=".\strings\stdstrings.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\strings\stdstrings.cpp">\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\events\stopwatch.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath=".\strings\strings.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\strings\strings.cpp">\r
                        </File>\r


@@ -732,12 +520,18 @@
                        <File\r
                                RelativePath=".\streams\textstreamtest.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\streams\textstreamtest.cpp">\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\events\timertest.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath=".\thread\tls.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\strings\tokenizer.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\thread\tls.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\strings\tokenizer.cpp">\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\misc\typeinfotest.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath=".\strings\unichar.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\strings\unichar.cpp">\r
                        </File>\r


@@ -747,6 +541,9 @@
                        <File\r
                                RelativePath=".\uris\uris.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\uris\uris.cpp">\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\uris\url.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath=".\strings\vararg.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\strings\vararg.cpp">\r
                        </File>\r