added wxProtocolLog class for logging network requests/responses (closes #7464)

[wxWidgets.git] / tests / test_vc8_test_gui.vcproj

diff --git a/tests/test_vc8_test_gui.vcproj b/tests/test_vc8_test_gui.vcproj
index 65aa8f61de6de526ef6f8e3774ea485189e6195d..f5a15dd0f4a8b98fdee9980fc4ed33f8f3c059bf 100644 (file)
--- a/tests/test_vc8_test_gui.vcproj
+++ b/tests/test_vc8_test_gui.vcproj
@@ -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
 <!--\r
 \r
   This makefile was generated by\r

-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.5 (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,21 +43,15 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r

-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

                                ExceptionHandling="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r

                                RuntimeLibrary="2"\r
                                RuntimeLibrary="2"\r

-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r


@@ -67,36 +61,41 @@
                                ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                ProgramDataBaseFileName="vc_mswunivudll\test_gui.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
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r

-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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
                                AdditionalOptions=""\r

+                               AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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_gui.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswunivudll\test_gui.exe"\r
                                LinkIncremental="2"\r

-                               SubSystem="1"\r

                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r

+                               SubSystem="1"\r

                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\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="VCXDCMakeTool"\r
                        />\r


@@ -140,21 +139,18 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r

+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

                                BasicRuntimeChecks="3"\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
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r


@@ -164,36 +160,41 @@
                                ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                ProgramDataBaseFileName="vc_mswunivuddll\test_gui.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
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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
                                AdditionalOptions=""\r

+                               AdditionalDependencies="wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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_gui.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswunivuddll\test_gui.exe"\r
                                LinkIncremental="2"\r

-                               SubSystem="1"\r

                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswunivuddll\test_gui.pdb"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswunivuddll\test_gui.pdb"\r

+                               SubSystem="1"\r

                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\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="VCXDCMakeTool"\r
                        />\r


@@ -237,21 +238,15 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r

-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

                                ExceptionHandling="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r

                                RuntimeLibrary="2"\r
                                RuntimeLibrary="2"\r

-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r


@@ -261,36 +256,41 @@
                                ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                ProgramDataBaseFileName="vc_mswudll\test_gui.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
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

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

-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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
                                AdditionalOptions=""\r

+                               AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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_gui.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswudll\test_gui.exe"\r
                                LinkIncremental="2"\r

-                               SubSystem="1"\r

                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r

+                               SubSystem="1"\r

                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\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="VCXDCMakeTool"\r
                        />\r


@@ -334,21 +334,18 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r

+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

                                BasicRuntimeChecks="3"\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
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r


@@ -358,36 +355,41 @@
                                ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                ProgramDataBaseFileName="vc_mswuddll\test_gui.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
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

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

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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
                                AdditionalOptions=""\r

+                               AdditionalDependencies="wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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_gui.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswuddll\test_gui.exe"\r
                                LinkIncremental="2"\r

-                               SubSystem="1"\r

                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswuddll\test_gui.pdb"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswuddll\test_gui.pdb"\r

+                               SubSystem="1"\r

                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\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="VCXDCMakeTool"\r
                        />\r


@@ -431,21 +433,15 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r

-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r

                                ExceptionHandling="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r

                                RuntimeLibrary="2"\r
                                RuntimeLibrary="2"\r

-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r


@@ -455,36 +451,41 @@
                                ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                ProgramDataBaseFileName="vc_mswunivu\test_gui.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
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r

-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxmswuniv29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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
                                AdditionalOptions=""\r

+                               AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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_gui.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswunivu\test_gui.exe"\r
                                LinkIncremental="2"\r

-                               SubSystem="1"\r

                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r

+                               SubSystem="1"\r

                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\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="VCXDCMakeTool"\r
                        />\r


@@ -528,21 +529,18 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r

+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r

                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r

                                BasicRuntimeChecks="3"\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
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r


@@ -552,36 +550,41 @@
                                ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                ProgramDataBaseFileName="vc_mswunivud\test_gui.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
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxmswuniv29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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
                                AdditionalOptions=""\r

+                               AdditionalDependencies="wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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_gui.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswunivud\test_gui.exe"\r
                                LinkIncremental="2"\r

-                               SubSystem="1"\r

                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswunivud\test_gui.pdb"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswunivud\test_gui.pdb"\r

+                               SubSystem="1"\r

                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\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="VCXDCMakeTool"\r
                        />\r


@@ -625,21 +628,15 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r

-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r

                                ExceptionHandling="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r

                                RuntimeLibrary="2"\r
                                RuntimeLibrary="2"\r

-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r


@@ -649,36 +646,41 @@
                                ProgramDataBaseFileName="vc_mswu\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                ProgramDataBaseFileName="vc_mswu\test_gui.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
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r

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

-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxmsw29u_core.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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
                                AdditionalOptions=""\r

+                               AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   wxtiff.lib wxjpeg.lib wxpng.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_gui.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswu\test_gui.exe"\r
                                LinkIncremental="2"\r

-                               SubSystem="1"\r

                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r

+                               SubSystem="1"\r

                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\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="VCXDCMakeTool"\r
                        />\r


@@ -722,21 +724,18 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r

+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r

                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r

                                BasicRuntimeChecks="3"\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
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r


@@ -746,36 +745,41 @@
                                ProgramDataBaseFileName="vc_mswud\test_gui.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                ProgramDataBaseFileName="vc_mswud\test_gui.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
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r

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

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxmsw29ud_core.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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
                                AdditionalOptions=""\r

+                               AdditionalDependencies="wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   wxtiffd.lib wxjpegd.lib wxpngd.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_gui.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswud\test_gui.exe"\r
                                LinkIncremental="2"\r

-                               SubSystem="1"\r

                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswud\test_gui.pdb"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswud\test_gui.pdb"\r

+                               SubSystem="1"\r

                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\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="VCXDCMakeTool"\r
                        />\r


@@ -804,18 +808,21 @@
        <Files>\r
                <Filter\r
                        Name="Source Files"\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
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r

+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r

                        >\r
                        <File\r
                                RelativePath=".\window\clientsize.cpp"\r
                        >\r
                        <File\r
                                RelativePath=".\window\clientsize.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath=".\controls\comboboxtest.cpp"\r
                        <File\r
                                RelativePath=".\controls\comboboxtest.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath=".\config\config.cpp"\r
                        <File\r
                                RelativePath=".\config\config.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

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


@@ -884,45 +891,84 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r

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

                        <File\r
                                RelativePath=".\misc\guifuncs.cpp"\r
                        <File\r
                                RelativePath=".\misc\guifuncs.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\headerctrltest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\html\htmlwindow.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\listctrltest.cpp"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath=".\geometry\point.cpp"\r
                        <File\r
                                RelativePath=".\geometry\point.cpp"\r

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

                        <File\r
                                RelativePath=".\image\rawbmp.cpp"\r
                        <File\r
                                RelativePath=".\image\rawbmp.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath=".\geometry\rect.cpp"\r
                        <File\r
                                RelativePath=".\geometry\rect.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath=".\misc\selstoretest.cpp"\r
                        <File\r
                                RelativePath=".\misc\selstoretest.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath=".\window\setsize.cpp"\r
                        <File\r
                                RelativePath=".\window\setsize.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath=".\geometry\size.cpp"\r
                        <File\r
                                RelativePath=".\geometry\size.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\net\socket.cpp"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath=".\test.cpp"\r
                        <File\r
                                RelativePath=".\test.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath=".\controls\textctrltest.cpp"\r
                        <File\r
                                RelativePath=".\controls\textctrltest.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath=".\controls\textentrytest.cpp"\r
                        <File\r
                                RelativePath=".\controls\textentrytest.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\treectrltest.cpp"\r
+                               >\r
+                       </File>\r

                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r

-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r

                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r

+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r

                        >\r
                        <File\r
                                RelativePath=".\..\samples\sample.rc"\r
                        >\r
                        <File\r
                                RelativePath=".\..\samples\sample.rc"\r

-                       />\r
+                               >\r
+                       </File>\r

                </Filter>\r
        </Files>\r
        <Globals>\r
                </Filter>\r
        </Files>\r
        <Globals>\r