]> git.saurik.com Git - wxWidgets.git/blobdiff - build/msw/wx_vc8_adv.vcproj
more attempts to fix CppUnit::assertEquals for VC6 without breaking everything else
[wxWidgets.git] / build / msw / wx_vc8_adv.vcproj
index 841f3009f3f074442c64d89d3d12f0df6b242cca..db5a614932b876668571c5c4f4ea13eb543483b3 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
+  Bakefile 0.2.5 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.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__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                AdditionalOptions=""\r
+                               AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                OutputFile="..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_adv.lib"\r
@@ -97,6 +93,9 @@
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.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__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
                                AdditionalOptions=""\r
+                               AdditionalDependencies="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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
                                OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_adv.lib"\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.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__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                AdditionalOptions=""\r
+                               AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
                                OutputFile="..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_adv.lib"\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_adv_vc_custom.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__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
                                AdditionalOptions=""\r
+                               AdditionalDependencies="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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
                                OutputFile="..\..\lib\vc_dll\wxmsw290ud_adv_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_adv.lib"\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_adv.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__;_UNICODE;WXBUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
                                BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_adv.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__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="false"\r
+                               PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
                                RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_adv.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__;_UNICODE;WXBUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
                                BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_adv.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__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        >\r
                        <File\r
                                RelativePath="..\..\src\common\animatecmn.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\bmpcboxcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\calctrlcmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\datavcmn.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\dummy.cpp"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\common\hyperlnkcmn.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\taskbarcmn.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="MSW Sources"\r
                        >\r
                        <File\r
                                RelativePath="..\..\src\msw\aboutdlg.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\bmpcbox.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\calctrl.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\datecontrols.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\datectrl.cpp"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\joystick.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\notifmsg.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\sound.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\taskbar.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\version.rc"\r
                                >\r
                        >\r
                        <File\r
                                RelativePath="..\..\src\generic\aboutdlgg.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\animateg.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\bmpcboxg.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
-                               RelativePath="..\..\src\generic\calctrl.cpp"\r
-                       />\r
+                               RelativePath="..\..\src\generic\calctrlg.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\datavgen.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\datectlg.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\editlbox.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\grid.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\gridctrl.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\gridsel.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\helpext.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\hyperlinkg.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\laywin.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\notifmsgg.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\odcombo.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\propdlg.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\sashwin.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\splash.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\tipdlg.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\wizard.cpp"\r
-                       />\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Setup Headers"\r
                        Name="MSW Headers"\r
                        UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}"\r
                        >\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\bmpcbox.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\calctrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datecontrols.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\datectrl.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\joystick.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\notifmsg.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\sound.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\taskbar.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Generic Headers"\r
                        >\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\aboutdlgg.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\animate.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\bmpcbox.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\generic\calctrl.h"\r
-                       />\r
+                               RelativePath="..\..\include\wx\generic\calctrlg.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\dataview.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\datectrl.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\grid.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\gridctrl.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\gridsel.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\helpext.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\hyperlink.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\laywin.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\notifmsg.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\propdlg.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\sashwin.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\splash.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\wizard.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Common Headers"\r
                        >\r
                        <File\r
                                RelativePath="..\..\include\wx\aboutdlg.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\animate.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\bmpcbox.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\calctrl.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\dataview.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\datectrl.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\dateevt.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\dcbuffer.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\editlbox.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\grid.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\hyperlink.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\joystick.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\laywin.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\notifmsg.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\odcombo.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\propdlg.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\sashwin.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\sound.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\splash.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\taskbar.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\tipdlg.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\wizard.h"\r
-                       />\r
+                               >\r
+                       </File>\r
                </Filter>\r
        </Files>\r
        <Globals>\r