]> git.saurik.com Git - wxWidgets.git/blobdiff - tests/test_vc8_test.vcproj
adding HitTest to osx_cocoa implementation of listbox, refactoring code, fixes #11972
[wxWidgets.git] / tests / test_vc8_test.vcproj
index d20c74ab47aaa24ca699d52ac404692079910b3a..75e2622f6ad3dab53c502d634877ff45c07fad15 100644 (file)
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
 <!--\r
 \r
-  This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  This project was generated by\r
+  Bakefile 0.2.8 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -22,9 +22,9 @@
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\test"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
-                               MinimalRebuild="false"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\test\"\r
-                               ObjectFile="vc_mswunivudll\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\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
+                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\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
                                AdditionalOptions=""\r
-                               OutputFile="vc_mswunivudll\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
-                               SubSystem="1"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswud\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_vc8_test.bsc"\r
+                               OutputFile="vc_mswud\test_vc8_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\test"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="vc_mswu"\r
+                       IntermediateDirectory="vc_mswu\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\test\"\r
-                               ObjectFile="vc_mswunivuddll\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\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
+                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\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
                                AdditionalOptions=""\r
-                               OutputFile="vc_mswunivuddll\test.exe"\r
-                               LinkIncremental="2"\r
-                               SubSystem="1"\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
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivuddll\test.pdb"\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="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\test_vc8_test.bsc"\r
+                               OutputFile="vc_mswu\test_vc8_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\test"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivud"\r
+                       IntermediateDirectory="vc_mswunivud\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
-                               MinimalRebuild="false"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswudll\test\"\r
-                               ObjectFile="vc_mswudll\test\"\r
-                               ProgramDataBaseFileName="vc_mswudll\test.pdb"\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
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\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
                                AdditionalOptions=""\r
-                               OutputFile="vc_mswudll\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_mswunivud\test.exe"\r
                                LinkIncremental="2"\r
-                               SubSystem="1"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswudll\test.pdb"\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_mswudll\test_vc8_test.bsc"\r
+                               OutputFile="vc_mswunivud\test_vc8_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\test"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivu"\r
+                       IntermediateDirectory="vc_mswunivu\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\test\"\r
-                               ObjectFile="vc_mswuddll\test\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\test.pdb"\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
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\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
                                AdditionalOptions=""\r
-                               OutputFile="vc_mswuddll\test.exe"\r
-                               LinkIncremental="2"\r
-                               SubSystem="1"\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_mswunivu\test.exe"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswuddll\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivu\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="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\test_vc8_test.bsc"\r
+                               OutputFile="vc_mswunivu\test_vc8_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\test"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="vc_mswuddll"\r
+                       IntermediateDirectory="vc_mswuddll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
-                               MinimalRebuild="false"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\test\"\r
-                               ObjectFile="vc_mswunivu\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\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
+                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\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
                                AdditionalOptions=""\r
-                               OutputFile="vc_mswunivu\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
-                               SubSystem="1"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivu\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\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_vc8_test.bsc"\r
+                               OutputFile="vc_mswuddll\test_vc8_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\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
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\test\"\r
-                               ObjectFile="vc_mswunivud\test\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\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
+                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\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
                                AdditionalOptions=""\r
-                               OutputFile="vc_mswunivud\test.exe"\r
-                               LinkIncremental="2"\r
-                               SubSystem="1"\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
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswunivud\test.pdb"\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="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\test_vc8_test.bsc"\r
+                               OutputFile="vc_mswudll\test_vc8_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\test"\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
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
-                               MinimalRebuild="false"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswu\test\"\r
-                               ObjectFile="vc_mswu\test\"\r
-                               ProgramDataBaseFileName="vc_mswu\test.pdb"\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
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\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
                                AdditionalOptions=""\r
-                               OutputFile="vc_mswu\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_mswunivuddll\test.exe"\r
                                LinkIncremental="2"\r
-                               SubSystem="1"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswu\test.pdb"\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_mswu\test_vc8_test.bsc"\r
+                               OutputFile="vc_mswunivuddll\test_vc8_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\test"\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
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\testprec_test.pch"\r
-                               AssemblerListingLocation="vc_mswud\test\"\r
-                               ObjectFile="vc_mswud\test\"\r
-                               ProgramDataBaseFileName="vc_mswud\test.pdb"\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
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\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
                                AdditionalOptions=""\r
-                               OutputFile="vc_mswud\test.exe"\r
-                               LinkIncremental="2"\r
-                               SubSystem="1"\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_mswunivudll\test.exe"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc_mswud\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivudll\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="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\test_vc8_test.bsc"\r
+                               OutputFile="vc_mswunivudll\test_vc8_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
        <Files>\r
                <Filter\r
                        Name="Source Files"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       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
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\arrays\arrays.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\thread\atomic.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\base64\base64.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\streams\bstream.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\cmdline\cmdlinetest.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\mbconv\convautotest.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\strings\crt.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\streams\datastreamtest.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\datetime\datetimetest.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\file\dir.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\dummy.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\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
-                       />\r
+                               >\r
+                       </File>\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
                        <File\r
                                RelativePath=".\streams\ffilestream.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\streams\fileback.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\config\fileconf.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\file\filefn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\filekind\filekind.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\filename\filenametest.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\streams\filestream.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\filesys\filesystest.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\file\filetest.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\fontmap\fontmaptest.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\formatconverter\formatconvertertest.cpp"\r
-                       />\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
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\intl\intltest.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\strings\iostream.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\streams\iostreams.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\net\ipc.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\streams\largefile.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\lists\lists.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\log\logtest.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\longlong\longlongtest.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\mbconv\mbconvtest.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\streams\memstream.cpp"\r
-                       />\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\module.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\misc\pathlist.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\thread\queue.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\config\regconf.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\regex\regextest.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\scopeguard\scopeguardtest.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\net\socket.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\streams\socketstream.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\streams\sstream.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\streams\stdstream.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\strings\stdstrings.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\events\stopwatch.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\strings\strings.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\archive\tartest.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\streams\tempfile.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\test.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\textfile\textfiletest.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\streams\textstreamtest.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\events\timertest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\thread\tls.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\strings\tokenizer.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\misc\typeinfotest.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\strings\unichar.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\strings\unicode.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\uris\uris.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\uris\url.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\strings\vararg.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\vectors\vectors.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\strings\vsnprintf.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\weakref\weakref.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\regex\wxregextest.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\xlocale\xlocale.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\xml\xmltest.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\archive\ziptest.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\streams\zlibstream.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                </Filter>\r
        </Files>\r
        <Globals>\r