X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aaa0312528610470651609e54cf0b9b80b260f2e..de8fe8ca3db62aa69a00f9547367c223ba59a23e:/build/msw/wx_vc8_xrc.vcproj

diff --git a/build/msw/wx_vc8_xrc.vcproj b/build/msw/wx_vc8_xrc.vcproj
index 613fdff985..110c003821 100644
--- a/build/msw/wx_vc8_xrc.vcproj
+++ b/build/msw/wx_vc8_xrc.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_XRC"
 				ExceptionHandling="1"
-				AdditionalOptions=""
 				RuntimeLibrary="2"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
@@ -67,23 +61,25 @@
 				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_xrc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
 				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_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
 			/>
 			<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_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.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_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"
 				OutputFile="..\..\lib\vc_dll\wxmswuniv290u_xrc_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_xrc.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_XRC"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"
 				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_xrc_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_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
 				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_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
 			/>
 			<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_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.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_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"
 				OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_xrc_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_xrc.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_XRC"
 				ExceptionHandling="1"
-				AdditionalOptions=""
 				RuntimeLibrary="2"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="wx/wxprec.h"
@@ -249,23 +244,25 @@
 				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_xrc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
 				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_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
 			/>
 			<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_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.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_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw290u_xrc_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw29u_xrc.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_XRC"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"
 				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_xrc_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_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
 				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_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
 			/>
 			<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_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.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_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"
 				OutputFile="..\..\lib\vc_dll\wxmsw290ud_xrc_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_xrc.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_xrc.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_xrc.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_xrc.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_xrc.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"
 			/>
@@ -1044,355 +1048,478 @@
 			>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_all.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_animatctrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_bmp.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_bmpbt.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_bmpcbox.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_bttn.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_cald.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_chckb.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_chckl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_choic.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_choicbk.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_clrpicker.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_collpane.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_combo.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_comboctrl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_datectrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_dirpicker.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_dlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_filepicker.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_fontpicker.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_frame.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_gauge.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_gdctl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_grid.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_html.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_htmllbox.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_hyperlink.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_listb.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_listbk.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_listc.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_mdi.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_menu.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_notbk.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_odcombo.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_panel.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_propdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_radbt.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_radbx.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_scrol.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_scwin.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_sizer.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_slidr.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_spin.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_split.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_srchctrl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_statbar.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_stbmp.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_stbox.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_stlin.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_sttxt.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_text.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_toolb.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_tree.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_treebk.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_unkwn.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_wizrd.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xmlres.h"
-			/>
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Source Files"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
 				RelativePath="..\..\src\xrc\xh_animatctrl.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_bmp.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_bmpbt.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_bmpcbox.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_bttn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_cald.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_chckb.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_chckl.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_choic.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_choicbk.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_clrpicker.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_collpane.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_combo.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\xrc\xh_comboctrl.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_datectrl.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_dirpicker.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_dlg.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_filepicker.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_fontpicker.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_frame.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_gauge.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_gdctl.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_grid.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_html.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_htmllbox.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_hyperlink.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_listb.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_listbk.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_listc.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_mdi.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_menu.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_notbk.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_odcombo.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_panel.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_propdlg.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_radbt.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_radbx.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_scrol.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_scwin.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_sizer.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_slidr.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_spin.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_split.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_srchctrl.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_statbar.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_stbmp.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_stbox.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_stlin.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_sttxt.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_text.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_tglbtn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_toolb.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_tree.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_treebk.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_unkwn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_wizrd.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xmladv.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xmlres.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\xrc\xmlrsall.cpp"
-			/>
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>