Fix compilation with MinGW -std=c++11 option.

[wxWidgets.git] / tests / test_vc9_test.vcproj

diff --git a/tests/test_vc9_test.vcproj b/tests/test_vc9_test.vcproj
index 09537cfe0c17256877fbdc9ac5a579dec3af65e3..3324157e5147472191ea7476f8b2b84cfbc2c2ab 100644 (file)
--- a/tests/test_vc9_test.vcproj
+++ b/tests/test_vc9_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.5 (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


@@ -43,8 +43,8 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
                        />\r
                        <Tool\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
                        />\r
                        <Tool\r


@@ -52,7 +52,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r

-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r

                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r


@@ -72,7 +72,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
                        />\r


@@ -82,7 +82,7 @@
                        <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 wininet.lib"\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
                                OutputFile="vc_mswud\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r


@@ -139,8 +139,8 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
                        />\r
                        <Tool\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
                        />\r
                        <Tool\r


@@ -148,7 +148,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r

-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r

                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r


@@ -166,7 +166,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
                        />\r


@@ -176,9 +176,9 @@
                        <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 wininet.lib"\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
                                OutputFile="vc_mswu\test.exe"\r

-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r

                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r


@@ -186,6 +186,8 @@
                                ProgramDatabaseFile="vc_mswu\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                                ProgramDatabaseFile="vc_mswu\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r

+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r

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


@@ -211,196 +213,6 @@
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r

-               <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\test"\r
-                       ConfigurationType="1"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch"\r
-                               ObjectFile="vc_mswunivud\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\test.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\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 wininet.lib"\r
-                               OutputFile="vc_mswunivud\test.exe"\r
-                               LinkIncremental="2"\r
-                               SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivud\test.pdb"\r
-                               SubSystem="1"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\test_vc9_test.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\test"\r
-                       ConfigurationType="1"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch"\r
-                               ObjectFile="vc_mswunivu\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\test.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\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 wininet.lib"\r
-                               OutputFile="vc_mswunivu\test.exe"\r
-                               LinkIncremental="2"\r
-                               SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivu\test.pdb"\r
-                               SubSystem="1"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\test_vc9_test.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r

                <Configuration\r
                        Name="DLL Debug|Win32"\r
                        OutputDirectory="vc_mswuddll"\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r
                        OutputDirectory="vc_mswuddll"\r


@@ -423,8 +235,8 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
                        />\r
                        <Tool\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
                        />\r
                        <Tool\r


@@ -432,7 +244,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r

-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r


@@ -452,7 +264,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
                        />\r


@@ -462,7 +274,7 @@
                        <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 wininet.lib"\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
                                OutputFile="vc_mswuddll\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r


@@ -519,8 +331,8 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
                        />\r
                        <Tool\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
                        />\r
                        <Tool\r


@@ -528,7 +340,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r

-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r


@@ -546,7 +358,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
                        />\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
                        />\r


@@ -556,9 +368,9 @@
                        <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 wininet.lib"\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
                                OutputFile="vc_mswudll\test.exe"\r

-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r

                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r


@@ -566,6 +378,8 @@
                                ProgramDatabaseFile="vc_mswudll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                                ProgramDatabaseFile="vc_mswudll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r

+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r

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


@@ -591,196 +405,6 @@
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r

-               <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\test"\r
-                       ConfigurationType="1"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch"\r
-                               ObjectFile="vc_mswunivuddll\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\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 wininet.lib"\r
-                               OutputFile="vc_mswunivuddll\test.exe"\r
-                               LinkIncremental="2"\r
-                               SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\test.pdb"\r
-                               SubSystem="1"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\test_vc9_test.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\test"\r
-                       ConfigurationType="1"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch"\r
-                               ObjectFile="vc_mswunivudll\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\test.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\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 wininet.lib"\r
-                               OutputFile="vc_mswunivudll\test.exe"\r
-                               LinkIncremental="2"\r
-                               SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r
-                               SubSystem="1"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\test_vc9_test.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r

        </Configurations>\r
        <References>\r
                \r
        </Configurations>\r
        <References>\r
                \r


@@ -791,6 +415,10 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r

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

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


@@ -831,6 +459,10 @@
                                RelativePath=".\datetime\datetimetest.cpp"\r
                                >\r
                        </File>\r
                                RelativePath=".\datetime\datetimetest.cpp"\r
                                >\r
                        </File>\r

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

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


@@ -850,22 +482,6 @@
                                                UsePrecompiledHeader="1"\r
                                        />\r
                                </FileConfiguration>\r
                                                UsePrecompiledHeader="1"\r
                                        />\r
                                </FileConfiguration>\r

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

                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        >\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        >\r


@@ -882,22 +498,14 @@
                                                UsePrecompiledHeader="1"\r
                                        />\r
                                </FileConfiguration>\r
                                                UsePrecompiledHeader="1"\r
                                        />\r
                                </FileConfiguration>\r

-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"\r
-                                       />\r
-                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\misc\dynamiclib.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\misc\environ.cpp"\r
+                               >\r

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


@@ -907,6 +515,10 @@
                                RelativePath=".\events\evthandler.cpp"\r
                                >\r
                        </File>\r
                                RelativePath=".\events\evthandler.cpp"\r
                                >\r
                        </File>\r

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

                        <File\r
                                RelativePath=".\exec\exec.cpp"\r
                                >\r
                        <File\r
                                RelativePath=".\exec\exec.cpp"\r
                                >\r


@@ -923,6 +535,10 @@
                                RelativePath=".\config\fileconf.cpp"\r
                                >\r
                        </File>\r
                                RelativePath=".\config\fileconf.cpp"\r
                                >\r
                        </File>\r

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

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


@@ -939,6 +555,10 @@
                                RelativePath=".\filesys\filesystest.cpp"\r
                                >\r
                        </File>\r
                                RelativePath=".\filesys\filesystest.cpp"\r
                                >\r
                        </File>\r

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

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


@@ -947,10 +567,22 @@
                                RelativePath=".\formatconverter\formatconvertertest.cpp"\r
                                >\r
                        </File>\r
                                RelativePath=".\formatconverter\formatconvertertest.cpp"\r
                                >\r
                        </File>\r

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

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

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

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


@@ -975,6 +607,10 @@
                                RelativePath=".\lists\lists.cpp"\r
                                >\r
                        </File>\r
                                RelativePath=".\lists\lists.cpp"\r
                                >\r
                        </File>\r

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

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


@@ -987,14 +623,42 @@
                                RelativePath=".\streams\memstream.cpp"\r
                                >\r
                        </File>\r
                                RelativePath=".\streams\memstream.cpp"\r
                                >\r
                        </File>\r

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

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

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

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

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

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


@@ -1015,10 +679,18 @@
                                RelativePath=".\streams\sstream.cpp"\r
                                >\r
                        </File>\r
                                RelativePath=".\streams\sstream.cpp"\r
                                >\r
                        </File>\r

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

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

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

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


@@ -1055,6 +727,10 @@
                                RelativePath=".\strings\tokenizer.cpp"\r
                                >\r
                        </File>\r
                                RelativePath=".\strings\tokenizer.cpp"\r
                                >\r
                        </File>\r

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

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


@@ -1067,6 +743,10 @@
                                RelativePath=".\uris\uris.cpp"\r
                                >\r
                        </File>\r
                                RelativePath=".\uris\uris.cpp"\r
                                >\r
                        </File>\r

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

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