X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d2b0608bc2e712dabe4307f1d7f5a64a3e6995a9..4d833b7b7f86cc7a182a07b52e96705ca7c4c49f:/build/msw/wx_vc8_adv.vcproj?ds=inline

diff --git a/build/msw/wx_vc8_adv.vcproj b/build/msw/wx_vc8_adv.vcproj
index 9502e8062e..043530fa58 100644
--- a/build/msw/wx_vc8_adv.vcproj
+++ b/build/msw/wx_vc8_adv.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <!--
 
   This makefile was generated by
-  Bakefile 0.2.3 (http://www.bakefile.org)
+  Bakefile 0.2.5 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -43,21 +43,15 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				MinimalRebuild="false"
+				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
 				ExceptionHandling="1"
-				AdditionalOptions=""
 				RuntimeLibrary="2"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
@@ -67,23 +61,25 @@
 				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
 				AdditionalOptions=""
+				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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
 				OutputFile="..\..\lib\vc_dll\wxmswuniv290u_adv_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_adv.lib"
@@ -97,6 +93,9 @@
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -134,21 +133,18 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
@@ -158,23 +154,25 @@
 				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
 				AdditionalOptions=""
+				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 wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
 				OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_adv_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_adv.lib"
@@ -188,6 +186,9 @@
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -225,21 +226,15 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				MinimalRebuild="false"
+				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
 				ExceptionHandling="1"
-				AdditionalOptions=""
 				RuntimeLibrary="2"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
@@ -249,23 +244,25 @@
 				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
 				AdditionalOptions=""
+				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 wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw290u_adv_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw29u_adv.lib"
@@ -279,6 +276,9 @@
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -316,21 +316,18 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
@@ -340,23 +337,25 @@
 				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
 				AdditionalOptions=""
+				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 wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw290ud_adv_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_adv.lib"
@@ -370,6 +369,9 @@
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -407,21 +409,15 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				MinimalRebuild="false"
+				PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
 				ExceptionHandling="1"
-				AdditionalOptions=""
 				RuntimeLibrary="2"
-				PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
@@ -431,15 +427,17 @@
 				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_adv.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -452,6 +450,9 @@
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -489,21 +490,18 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
@@ -513,15 +511,17 @@
 				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_adv.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -534,6 +534,9 @@
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -571,21 +574,15 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				MinimalRebuild="false"
+				PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
 				ExceptionHandling="1"
-				AdditionalOptions=""
 				RuntimeLibrary="2"
-				PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
@@ -595,15 +592,17 @@
 				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_adv.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -616,6 +615,9 @@
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -653,21 +655,18 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
@@ -677,15 +676,17 @@
 				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_adv.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -698,6 +699,9 @@
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -724,13 +728,20 @@
 			>
 			<File
 				RelativePath="..\..\src\common\animatecmn.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\bmpcboxcmn.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\calctrlcmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\datavcmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\dummy.cpp"
 				>
@@ -801,10 +812,12 @@
 			</File>
 			<File
 				RelativePath="..\..\src\common\hyperlnkcmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\taskbarcmn.cpp"
-			/>
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="MSW Sources"
@@ -812,7 +825,28 @@
 			>
 			<File
 				RelativePath="..\..\src\msw\aboutdlg.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\bmpcbox.cpp"
+				>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\calctrl.cpp"
 				>
@@ -875,16 +909,20 @@
 			</File>
 			<File
 				RelativePath="..\..\src\msw\joystick.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\notifmsg.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\sound.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\taskbar.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\version.rc"
 				>
@@ -912,64 +950,88 @@
 			>
 			<File
 				RelativePath="..\..\src\generic\aboutdlgg.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\animateg.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\bmpcboxg.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\calctrlg.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\datavgen.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\datectlg.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\editlbox.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\grid.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\gridctrl.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\grideditors.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\gridsel.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\helpext.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\hyperlinkg.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\laywin.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\notifmsgg.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\odcombo.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\propdlg.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\sashwin.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\splash.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\tipdlg.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\generic\wizard.cpp"
-			/>
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Setup Headers"
@@ -1100,15 +1162,22 @@
 			Name="MSW Headers"
 			UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}"
 			>
+			<File
+				RelativePath="..\..\include\wx\msw\bmpcbox.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\calctrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\datecontrols.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\datectrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\genrcdefs.h"
 				>
@@ -1203,16 +1272,20 @@
 			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\joystick.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\notifmsg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\sound.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\taskbar.h"
-			/>
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Generic Headers"
@@ -1220,55 +1293,76 @@
 			>
 			<File
 				RelativePath="..\..\include\wx\generic\aboutdlgg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\animate.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\bmpcbox.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\calctrlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\dataview.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\datectrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\grid.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\gridctrl.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\grideditors.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\gridsel.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\helpext.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\hyperlink.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\laywin.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\notifmsg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\propdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\sashwin.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\splash.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\wizard.h"
-			/>
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Common Headers"
@@ -1276,70 +1370,92 @@
 			>
 			<File
 				RelativePath="..\..\include\wx\aboutdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\animate.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\bmpcbox.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\calctrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dataview.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\datectrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dateevt.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dcbuffer.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\editlbox.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\grid.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\hyperlink.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\joystick.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\laywin.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\notifmsg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\odcombo.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\propdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\sashwin.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\sound.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\splash.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\taskbar.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\tipdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\wizard.h"
-			/>
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>