X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c88a264a08a023e9544b684fd2dc28e8dd7b1c7d..9e1da4827a0ec18f9766d664b9af12c25e3f71fb:/build/msw/wx_vc7_base.vcproj?ds=sidebyside

diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj
index 51c44a8659..6b9cb0d6d0 100644
--- a/build/msw/wx_vc7_base.vcproj
+++ b/build/msw/wx_vc7_base.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)
+  This project was generated by
+  Bakefile 0.2.9 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -17,226 +17,238 @@
 	</Platforms>
 	<Configurations>
 		<Configuration
-			Name="DLL Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivudll\base"
-			ConfigurationType="2"
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswud\base"
+			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="3"
+				PrecompiledHeaderThrough="wx/wxprec.h"
+				PrecompiledHeaderFile="vc_mswud\wxprec_baselib.pch"
+				ObjectFile="vc_mswud\base\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxbase29ud.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswu\base"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="1">
 			<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"
-				ExceptionHandling="1"
-				AdditionalOptions=""
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
+				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswunivudll\wxprec_basedll.pch"
-				AssemblerListingLocation="vc_mswunivudll\base\"
-				ObjectFile="vc_mswunivudll\base\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290u_vc_custom.pdb"
+				PrecompiledHeaderFile="vc_mswu\wxprec_baselib.pch"
+				ObjectFile="vc_mswu\base\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				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=wxbase290u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxbase29u.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="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"
-				AdditionalOptions=""
-				OutputFile="..\..\lib\vc_dll\wxbase290u_vc_custom.dll"
-				LinkIncremental="2"
-				ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_vc_custom.pdb"
-				TargetMachine="1"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc7_base.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="DLL Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivuddll\base"
-			ConfigurationType="2"
+			Name="Universal Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswunivud\base"
+			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
 			<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"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswunivuddll\wxprec_basedll.pch"
-				AssemblerListingLocation="vc_mswunivuddll\base\"
-				ObjectFile="vc_mswunivuddll\base\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_vc_custom.pdb"
+				PrecompiledHeaderFile="vc_mswunivud\wxprec_baselib.pch"
+				ObjectFile="vc_mswunivud\base\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				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=wxbase290ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxbase29ud.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="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"
-				AdditionalOptions=""
-				OutputFile="..\..\lib\vc_dll\wxbase290ud_vc_custom.dll"
-				LinkIncremental="2"
-				ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290ud_vc_custom.pdb"
-				TargetMachine="1"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc7_base.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="DLL Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswudll\base"
-			ConfigurationType="2"
+			Name="Universal Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswunivu\base"
+			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
 			<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"
-				ExceptionHandling="1"
-				AdditionalOptions=""
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
+				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll\wxprec_basedll.pch"
-				AssemblerListingLocation="vc_mswudll\base\"
-				ObjectFile="vc_mswudll\base\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290u_vc_custom.pdb"
+				PrecompiledHeaderFile="vc_mswunivu\wxprec_baselib.pch"
+				ObjectFile="vc_mswunivu\base\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				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=wxbase290u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxbase29u.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="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"
-				AdditionalOptions=""
-				OutputFile="..\..\lib\vc_dll\wxbase290u_vc_custom.dll"
-				LinkIncremental="2"
-				ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_vc_custom.pdb"
-				TargetMachine="1"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc7_base.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|Win32"
@@ -244,337 +256,269 @@
 			IntermediateDirectory="vc_mswuddll\base"
 			ConfigurationType="2"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
 			<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"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch"
-				AssemblerListingLocation="vc_mswuddll\base\"
 				ObjectFile="vc_mswuddll\base\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				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=wxbase290ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="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"
 				AdditionalOptions=""
-				OutputFile="..\..\lib\vc_dll\wxbase290ud_vc_custom.dll"
+				AdditionalDependencies="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"
+				OutputFile="..\..\lib\vc_dll\wxbase295ud_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"
-				SuppressStartupBanner="true"
+				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290ud_vc_custom.pdb"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCALinkTool"/>
-			<Tool
-				Name="VCXDCMakeTool"/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc7_base.bsc"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
-		</Configuration>
-		<Configuration
-			Name="Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivu\base"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1">
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="DLL Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswudll\base"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="1">
 			<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"
-				ExceptionHandling="1"
-				AdditionalOptions=""
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
-				PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswunivu\wxprec_baselib.pch"
-				AssemblerListingLocation="vc_mswunivu\base\"
-				ObjectFile="vc_mswunivu\base\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u.pdb"
+				PrecompiledHeaderFile="vc_mswudll\wxprec_basedll.pch"
+				ObjectFile="vc_mswudll\base\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase295u_vc_custom.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				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;wxUSE_GUI=0;wxUSE_BASE=1"/>
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="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"
+				OutputFile="..\..\lib\vc_dll\wxbase295u_vc_custom.dll"
+				LinkIncremental="1"
+				ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\..\lib\vc_dll"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase295u_vc_custom.pdb"
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxbase29u.lib"
-				SuppressStartupBanner="true"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc7_base.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivud\base"
-			ConfigurationType="4"
+			Name="DLL Universal Debug|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswunivuddll\base"
+			ConfigurationType="2"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
 			<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"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswunivud\wxprec_baselib.pch"
-				AssemblerListingLocation="vc_mswunivud\base\"
-				ObjectFile="vc_mswunivud\base\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud.pdb"
+				PrecompiledHeaderFile="vc_mswunivuddll\wxprec_basedll.pch"
+				ObjectFile="vc_mswunivuddll\base\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				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;wxUSE_GUI=0;wxUSE_BASE=1"/>
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="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"
+				OutputFile="..\..\lib\vc_dll\wxbase295ud_vc_custom.dll"
+				LinkIncremental="2"
+				ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\..\lib\vc_dll"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxbase29ud.lib"
-				SuppressStartupBanner="true"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc7_base.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswu\base"
-			ConfigurationType="4"
+			Name="DLL Universal Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswunivudll\base"
+			ConfigurationType="2"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
 			<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"
-				ExceptionHandling="1"
-				AdditionalOptions=""
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
-				PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu\wxprec_baselib.pch"
-				AssemblerListingLocation="vc_mswu\base\"
-				ObjectFile="vc_mswu\base\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u.pdb"
+				PrecompiledHeaderFile="vc_mswunivudll\wxprec_basedll.pch"
+				ObjectFile="vc_mswunivudll\base\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase295u_vc_custom.pdb"
 				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				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;wxUSE_GUI=0;wxUSE_BASE=1"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxbase29u.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
-			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc7_base.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="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"
+				OutputFile="..\..\lib\vc_dll\wxbase295u_vc_custom.dll"
+				LinkIncremental="1"
+				ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\..\lib\vc_dll"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase295u_vc_custom.pdb"
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswud\base"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1">
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCIDLTool"/>
-			<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"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud\wxprec_baselib.pch"
-				AssemblerListingLocation="vc_mswud\base\"
-				ObjectFile="vc_mswud\base\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud.pdb"
-				WarningLevel="4"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
 				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;wxUSE_GUI=0;wxUSE_BASE=1"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxbase29ud.lib"
-				SuppressStartupBanner="true"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc7_base.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -585,324 +529,463 @@
 			Name="Common Sources"
 			UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}">
 			<File
-				RelativePath="..\..\src\common\appbase.cpp"/>
+				RelativePath="..\..\src\common\any.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\arcall.cpp"/>
+				RelativePath="..\..\src\common\appbase.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\arcfind.cpp"/>
+				RelativePath="..\..\src\common\arcall.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\archive.cpp"/>
+				RelativePath="..\..\src\common\arcfind.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\arrstr.cpp"/>
+				RelativePath="..\..\src\common\archive.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\base64.cpp"/>
+				RelativePath="..\..\src\common\arrstr.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\clntdata.cpp"/>
+				RelativePath="..\..\src\common\base64.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\cmdline.cpp"/>
+				RelativePath="..\..\src\common\clntdata.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\config.cpp"/>
+				RelativePath="..\..\src\common\cmdline.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\convauto.cpp"/>
+				RelativePath="..\..\src\common\config.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\datetime.cpp"/>
+				RelativePath="..\..\src\common\convauto.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\common\datetime.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\datstrm.cpp"/>
+				RelativePath="..\..\src\common\datetimefmt.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\common\datstrm.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\dircmn.cpp"/>
+				RelativePath="..\..\src\common\dircmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\dummy.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32">
+					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32">
+					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32">
+					Name="Universal Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32">
+					Name="Universal Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32">
+					Name="DLL Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32">
+					Name="DLL Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="DLL Universal Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="DLL Universal Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\common\dynarray.cpp"/>
+				RelativePath="..\..\src\common\dynarray.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\dynlib.cpp"/>
+				RelativePath="..\..\src\common\dynlib.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\dynload.cpp"/>
+				RelativePath="..\..\src\common\dynload.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\encconv.cpp"/>
+				RelativePath="..\..\src\common\encconv.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\event.cpp"/>
+				RelativePath="..\..\src\common\event.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\evtloopcmn.cpp"/>
+				RelativePath="..\..\src\common\evtloopcmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\extended.c">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32">
+					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32">
+					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32">
+					Name="Universal Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32">
+					Name="Universal Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32">
+					Name="DLL Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32">
+					Name="DLL Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="DLL Universal Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="DLL Universal Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="0"/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\common\ffile.cpp"/>
+				RelativePath="..\..\src\common\ffile.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\common\file.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\common\fileback.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\common\fileconf.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\common\filefn.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\common\filename.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\common\filesys.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\common\filtall.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\common\filtfind.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\file.cpp"/>
+				RelativePath="..\..\src\common\fmapbase.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\fileback.cpp"/>
+				RelativePath="..\..\src\common\fs_arc.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\fileconf.cpp"/>
+				RelativePath="..\..\src\common\fs_filter.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\filefn.cpp"/>
+				RelativePath="..\..\src\common\fs_mem.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\filename.cpp"/>
+				RelativePath="..\..\src\common\fswatchercmn.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\filesys.cpp"/>
+				RelativePath="..\..\src\common\hash.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\filtall.cpp"/>
+				RelativePath="..\..\src\common\hashmap.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\filtfind.cpp"/>
+				RelativePath="..\..\src\common\init.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\fmapbase.cpp"/>
+				RelativePath="..\..\src\common\intl.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\fs_arc.cpp"/>
+				RelativePath="..\..\src\common\ipcbase.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\fs_filter.cpp"/>
+				RelativePath="..\..\src\common\languageinfo.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\fs_mem.cpp"/>
+				RelativePath="..\..\src\common\list.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\hash.cpp"/>
+				RelativePath="..\..\src\common\log.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\hashmap.cpp"/>
+				RelativePath="..\..\src\common\longlong.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\init.cpp"/>
+				RelativePath="..\..\src\common\memory.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\intl.cpp"/>
+				RelativePath="..\..\src\common\mimecmn.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\ipcbase.cpp"/>
+				RelativePath="..\..\src\common\module.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\list.cpp"/>
+				RelativePath="..\..\src\common\msgout.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\log.cpp"/>
+				RelativePath="..\..\src\common\mstream.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\longlong.cpp"/>
+				RelativePath="..\..\src\common\numformatter.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\memory.cpp"/>
+				RelativePath="..\..\src\common\object.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\mimecmn.cpp"/>
+				RelativePath="..\..\src\common\platinfo.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\module.cpp"/>
+				RelativePath="..\..\src\common\powercmn.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\msgout.cpp"/>
+				RelativePath="..\..\src\common\process.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\mstream.cpp"/>
+				RelativePath="..\..\src\common\regex.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\object.cpp"/>
+				RelativePath="..\..\src\common\sstream.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\platinfo.cpp"/>
+				RelativePath="..\..\src\common\stdpbase.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\powercmn.cpp"/>
+				RelativePath="..\..\src\common\stdstream.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\process.cpp"/>
+				RelativePath="..\..\src\common\stopwatch.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\regex.cpp"/>
+				RelativePath="..\..\src\common\strconv.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\sstream.cpp"/>
+				RelativePath="..\..\src\common\stream.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\stdpbase.cpp"/>
+				RelativePath="..\..\src\common\string.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\stopwatch.cpp"/>
+				RelativePath="..\..\src\common\stringimpl.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\strconv.cpp"/>
+				RelativePath="..\..\src\common\stringops.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\stream.cpp"/>
+				RelativePath="..\..\src\common\strvararg.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\string.cpp"/>
+				RelativePath="..\..\src\common\sysopt.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\stringimpl.cpp"/>
+				RelativePath="..\..\src\common\tarstrm.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\stringops.cpp"/>
+				RelativePath="..\..\src\common\textbuf.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\strvararg.cpp"/>
+				RelativePath="..\..\src\common\textfile.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\sysopt.cpp"/>
+				RelativePath="..\..\src\common\time.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\tarstrm.cpp"/>
+				RelativePath="..\..\src\common\timercmn.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\textbuf.cpp"/>
+				RelativePath="..\..\src\common\timerimpl.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\textfile.cpp"/>
+				RelativePath="..\..\src\common\tokenzr.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\timercmn.cpp"/>
+				RelativePath="..\..\src\common\translation.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\timerimpl.cpp"/>
+				RelativePath="..\..\src\common\txtstrm.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\tokenzr.cpp"/>
+				RelativePath="..\..\src\common\unichar.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\txtstrm.cpp"/>
+				RelativePath="..\..\src\common\uri.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\unichar.cpp"/>
+				RelativePath="..\..\src\common\ustring.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\uri.cpp"/>
+				RelativePath="..\..\src\common\utilscmn.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\utilscmn.cpp"/>
+				RelativePath="..\..\src\common\variant.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\variant.cpp"/>
+				RelativePath="..\..\src\common\wfstream.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\wfstream.cpp"/>
+				RelativePath="..\..\src\common\wxcrt.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\wxcrt.cpp"/>
+				RelativePath="..\..\src\common\wxprintf.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\wxprintf.cpp"/>
+				RelativePath="..\..\src\common\xlocale.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\xti.cpp"/>
+				RelativePath="..\..\src\common\xti.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\xtistrm.cpp"/>
+				RelativePath="..\..\src\common\xtistrm.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\zipstrm.cpp"/>
+				RelativePath="..\..\src\common\zipstrm.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\common\zstream.cpp"/>
+				RelativePath="..\..\src\common\zstream.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="MSW Sources"
 			UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">
 			<File
-				RelativePath="..\..\src\msw\basemsw.cpp"/>
+				RelativePath="..\..\src\msw\basemsw.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\msw\crashrpt.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\msw\crashrpt.cpp"/>
+				RelativePath="..\..\src\msw\dde.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\msw\dde.cpp"/>
+				RelativePath="..\..\src\msw\debughlp.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\msw\debughlp.cpp"/>
+				RelativePath="..\..\src\msw\dir.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\msw\dir.cpp"/>
+				RelativePath="..\..\src\msw\dlmsw.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\msw\dlmsw.cpp"/>
+				RelativePath="..\..\src\msw\evtloopconsole.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\msw\evtloop.cpp"/>
+				RelativePath="..\..\src\msw\fswatcher.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\msw\main.cpp"/>
+				RelativePath="..\..\src\msw\main.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\msw\mimetype.cpp"/>
+				RelativePath="..\..\src\msw\mimetype.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\msw\mslu.cpp"/>
+				RelativePath="..\..\src\msw\mslu.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\msw\power.cpp"/>
+				RelativePath="..\..\src\msw\power.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\msw\regconf.cpp"/>
+				RelativePath="..\..\src\msw\regconf.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\msw\registry.cpp"/>
+				RelativePath="..\..\src\msw\registry.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\msw\snglinst.cpp"/>
+				RelativePath="..\..\src\msw\snglinst.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\msw\stackwalk.cpp"/>
+				RelativePath="..\..\src\msw\stackwalk.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\msw\stdpaths.cpp"/>
+				RelativePath="..\..\src\msw\stdpaths.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\msw\thread.cpp"/>
+				RelativePath="..\..\src\msw\thread.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\msw\timer.cpp"/>
+				RelativePath="..\..\src\msw\timer.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\msw\utils.cpp"/>
+				RelativePath="..\..\src\msw\utils.cpp">
+			</File>
 			<File
-				RelativePath="..\..\src\msw\utilsexc.cpp"/>
+				RelativePath="..\..\src\msw\utilsexc.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\msw\version.rc">
 				<FileConfiguration
-					Name="Universal Release|Win32"
-					ExcludedFromBuild="true"/>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="true"/>
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="true"/>
+					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"/>
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\volume.cpp">
 			</File>
+		</Filter>
+		<Filter
+			Name="Generic Sources"
+			UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}">
 			<File
-				RelativePath="..\..\src\msw\volume.cpp"/>
+				RelativePath="..\..\src\generic\fswatcherg.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Setup Headers"
@@ -910,152 +993,148 @@
 			<File
 				RelativePath="..\..\include\wx\msw\setup.h">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"/>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"/>
-				<FileConfiguration
-					Name="DLL Release|Win32">
+					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"
+						Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32">
+					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"
+						Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Release|Win32"/>
 				<FileConfiguration
 					Name="Universal Debug|Win32"/>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Universal Release|Win32"/>
+				<FileConfiguration
+					Name="DLL Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"
+						Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="DLL Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"
+						Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"/>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\univ\setup.h">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32">
+					Name="Debug|Win32"/>
+				<FileConfiguration
+					Name="Release|Win32"/>
+				<FileConfiguration
+					Name="Universal Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"
+						Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32">
+					Name="Universal Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"
+						Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32"/>
 				<FileConfiguration
 					Name="DLL Debug|Win32"/>
 				<FileConfiguration
-					Name="Universal Release|Win32">
+					Name="DLL Release|Win32"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"
+						Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32">
+					Name="DLL Universal Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"
+						Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"/>
-				<FileConfiguration
-					Name="Debug|Win32"/>
 			</File>
 		</Filter>
 		<Filter
 			Name="MSW Headers"
 			UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}">
 			<File
-				RelativePath="..\..\include\wx\msw\apptbase.h"/>
+				RelativePath="..\..\include\wx\msw\apptbase.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\apptrait.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\chkconf.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\apptrait.h"/>
+				RelativePath="..\..\include\wx\msw\crashrpt.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\chkconf.h"/>
+				RelativePath="..\..\include\wx\msw\dde.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\crashrpt.h"/>
+				RelativePath="..\..\include\wx\msw\debughlp.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\dde.h"/>
+				RelativePath="..\..\include\wx\msw\evtloopconsole.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\debughlp.h"/>
+				RelativePath="..\..\include\wx\msw\fswatcher.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\gccpriv.h"/>
+				RelativePath="..\..\include\wx\msw\gccpriv.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\genrcdefs.h">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32">
+					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"/>
+						Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32">
+					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"/>
+						Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32">
+					Name="Universal Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"/>
+						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Universal Release|Win32">
@@ -1067,321 +1146,573 @@
 						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32">
+					Name="DLL Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"/>
+						Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="DLL Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"/>
+						Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="DLL Universal Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>
+						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\libraries.h"/>
+				RelativePath="..\..\include\wx\msw\libraries.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\mimetype.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\mimetype.h"/>
+				RelativePath="..\..\include\wx\msw\mslu.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\mslu.h"/>
+				RelativePath="..\..\include\wx\msw\private.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\private.h"/>
+				RelativePath="..\..\include\wx\msw\regconf.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\regconf.h"/>
+				RelativePath="..\..\include\wx\msw\registry.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\registry.h"/>
+				RelativePath="..\..\include\wx\msw\seh.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\seh.h"/>
+				RelativePath="..\..\include\wx\msw\stackwalk.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\stackwalk.h"/>
+				RelativePath="..\..\include\wx\msw\stdpaths.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\stdpaths.h"/>
+				RelativePath="..\..\include\wx\msw\winundef.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\winundef.h"/>
+				RelativePath="..\..\include\wx\msw\wrapcctl.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\wrapcctl.h"/>
+				RelativePath="..\..\include\wx\msw\wrapcdlg.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\wrapcdlg.h"/>
+				RelativePath="..\..\include\wx\msw\wrapwin.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Generic Headers"
+			UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}">
 			<File
-				RelativePath="..\..\include\wx\msw\wrapwin.h"/>
+				RelativePath="..\..\include\wx\generic\fswatcher.h">
+			</File>
 		</Filter>
 		<Filter
 			Name="wxHTML Headers"
 			UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}">
 			<File
-				RelativePath="..\..\include\wx\html\forcelnk.h"/>
+				RelativePath="..\..\include\wx\html\forcelnk.h">
+			</File>
 		</Filter>
 		<Filter
 			Name="Common Headers"
 			UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
 			<File
-				RelativePath="..\..\include\wx\afterstd.h"/>
+				RelativePath="..\..\include\wx\afterstd.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\any.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\anystr.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\app.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\apptrait.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\archive.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\arrstr.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\atomic.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\base64.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\beforestd.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\buffer.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\build.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\chartype.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\checkeddelete.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\chkconf.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\clntdata.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\cmdargs.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\cmdline.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\confbase.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\config.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\containr.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\convauto.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\meta\convertible.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\cpp.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\crt.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\datetime.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\datstrm.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dde.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\debug.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\defs.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dir.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dlimpexp.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dlist.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\app.h"/>
+				RelativePath="..\..\include\wx\dynarray.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\apptrait.h"/>
+				RelativePath="..\..\include\wx\dynlib.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\archive.h"/>
+				RelativePath="..\..\include\wx\dynload.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\arrstr.h"/>
+				RelativePath="..\..\include\wx\encconv.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\atomic.h"/>
+				RelativePath="..\..\include\wx\event.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\base64.h"/>
+				RelativePath="..\..\include\wx\eventfilter.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\beforestd.h"/>
+				RelativePath="..\..\include\wx\evtloop.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\buffer.h"/>
+				RelativePath="..\..\include\wx\except.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\build.h"/>
+				RelativePath="..\..\include\wx\features.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\chartype.h"/>
+				RelativePath="..\..\include\wx\ffile.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\chkconf.h"/>
+				RelativePath="..\..\include\wx\file.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\clntdata.h"/>
+				RelativePath="..\..\include\wx\fileconf.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\cmdargs.h"/>
+				RelativePath="..\..\include\wx\filefn.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\cmdline.h"/>
+				RelativePath="..\..\include\wx\filename.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\confbase.h"/>
+				RelativePath="..\..\include\wx\filesys.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\config.h"/>
+				RelativePath="..\..\include\wx\flags.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\containr.h"/>
+				RelativePath="..\..\include\wx\fontenc.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\convauto.h"/>
+				RelativePath="..\..\include\wx\fontmap.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\meta\convertible.h"/>
+				RelativePath="..\..\include\wx\fs_arc.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\cpp.h"/>
+				RelativePath="..\..\include\wx\fs_filter.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\crt.h"/>
+				RelativePath="..\..\include\wx\fs_mem.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\datetime.h"/>
+				RelativePath="..\..\include\wx\fs_zip.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\datstrm.h"/>
+				RelativePath="..\..\include\wx\fswatcher.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\dde.h"/>
+				RelativePath="..\..\include\wx\hash.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\debug.h"/>
+				RelativePath="..\..\include\wx\hashmap.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\defs.h"/>
+				RelativePath="..\..\include\wx\hashset.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\dir.h"/>
+				RelativePath="..\..\include\wx\iconloc.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\dlimpexp.h"/>
+				RelativePath="..\..\include\wx\meta\if.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\dynarray.h"/>
+				RelativePath="..\..\include\wx\meta\implicitconversion.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\dynlib.h"/>
+				RelativePath="..\..\include\wx\init.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\dynload.h"/>
+				RelativePath="..\..\include\wx\meta\int2type.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\encconv.h"/>
+				RelativePath="..\..\include\wx\intl.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\event.h"/>
+				RelativePath="..\..\include\wx\iosfwrap.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\except.h"/>
+				RelativePath="..\..\include\wx\ioswrap.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\features.h"/>
+				RelativePath="..\..\include\wx\ipc.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\ffile.h"/>
+				RelativePath="..\..\include\wx\ipcbase.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\file.h"/>
+				RelativePath="..\..\include\wx\kbdstate.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\fileconf.h"/>
+				RelativePath="..\..\include\wx\language.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\filefn.h"/>
+				RelativePath="..\..\include\wx\link.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\filename.h"/>
+				RelativePath="..\..\include\wx\list.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\filesys.h"/>
+				RelativePath="..\..\include\wx\log.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\flags.h"/>
+				RelativePath="..\..\include\wx\longlong.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\fontenc.h"/>
+				RelativePath="..\..\include\wx\math.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\fontmap.h"/>
+				RelativePath="..\..\include\wx\memconf.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\fs_arc.h"/>
+				RelativePath="..\..\include\wx\memory.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\fs_filter.h"/>
+				RelativePath="..\..\include\wx\memtext.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\fs_mem.h"/>
+				RelativePath="..\..\include\wx\mimetype.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\fs_zip.h"/>
+				RelativePath="..\..\include\wx\module.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\hash.h"/>
+				RelativePath="..\..\include\wx\mousestate.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\hashmap.h"/>
+				RelativePath="..\..\include\wx\meta\movable.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\hashset.h"/>
+				RelativePath="..\..\include\wx\msgout.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\iconloc.h"/>
+				RelativePath="..\..\include\wx\msgqueue.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\meta\if.h"/>
+				RelativePath="..\..\include\wx\mstream.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\init.h"/>
+				RelativePath="..\..\include\wx\numformatter.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\meta\int2type.h"/>
+				RelativePath="..\..\include\wx\object.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\intl.h"/>
+				RelativePath="..\..\include\wx\platform.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\iosfwrap.h"/>
+				RelativePath="..\..\include\wx\platinfo.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\ioswrap.h"/>
+				RelativePath="..\..\include\wx\meta\pod.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\ipc.h"/>
+				RelativePath="..\..\include\wx\power.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\ipcbase.h"/>
+				RelativePath="..\..\include\wx\process.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\link.h"/>
+				RelativePath="..\..\include\wx\ptr_scpd.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\list.h"/>
+				RelativePath="..\..\include\wx\ptr_shrd.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\log.h"/>
+				RelativePath="..\..\include\wx\recguard.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\longlong.h"/>
+				RelativePath="..\..\include\wx\regex.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\math.h"/>
+				RelativePath="..\..\include\wx\meta\removeref.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\memconf.h"/>
+				RelativePath="..\..\include\wx\rtti.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\memory.h"/>
+				RelativePath="..\..\include\wx\scopedarray.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\memtext.h"/>
+				RelativePath="..\..\include\wx\scopedptr.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\mimetype.h"/>
+				RelativePath="..\..\include\wx\scopeguard.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\module.h"/>
+				RelativePath="..\..\include\wx\sharedptr.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\meta\movable.h"/>
+				RelativePath="..\..\include\wx\snglinst.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\msgout.h"/>
+				RelativePath="..\..\include\wx\sstream.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\mstream.h"/>
+				RelativePath="..\..\include\wx\stack.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\object.h"/>
+				RelativePath="..\..\include\wx\stackwalk.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\platform.h"/>
+				RelativePath="..\..\include\wx\stdpaths.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\platinfo.h"/>
+				RelativePath="..\..\include\wx\stdstream.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\power.h"/>
+				RelativePath="..\..\include\wx\stockitem.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\process.h"/>
+				RelativePath="..\..\include\wx\stopwatch.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\ptr_scpd.h"/>
+				RelativePath="..\..\include\wx\strconv.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\ptr_shrd.h"/>
+				RelativePath="..\..\include\wx\stream.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\recguard.h"/>
+				RelativePath="..\..\include\wx\string.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\regex.h"/>
+				RelativePath="..\..\include\wx\stringimpl.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\scopeguard.h"/>
+				RelativePath="..\..\include\wx\stringops.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\snglinst.h"/>
+				RelativePath="..\..\include\wx\strvararg.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\sstream.h"/>
+				RelativePath="..\..\include\wx\sysopt.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\stack.h"/>
+				RelativePath="..\..\include\wx\tarstrm.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\stackwalk.h"/>
+				RelativePath="..\..\include\wx\textbuf.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\stdpaths.h"/>
+				RelativePath="..\..\include\wx\textfile.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\stockitem.h"/>
+				RelativePath="..\..\include\wx\thread.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\stopwatch.h"/>
+				RelativePath="..\..\include\wx\time.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\strconv.h"/>
+				RelativePath="..\..\include\wx\timer.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\stream.h"/>
+				RelativePath="..\..\include\wx\tls.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\string.h"/>
+				RelativePath="..\..\include\wx\tokenzr.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\stringimpl.h"/>
+				RelativePath="..\..\include\wx\tracker.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\stringops.h"/>
+				RelativePath="..\..\include\wx\translation.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\strvararg.h"/>
+				RelativePath="..\..\include\wx\txtstrm.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\sysopt.h"/>
+				RelativePath="..\..\include\wx\typeinfo.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\tarstrm.h"/>
+				RelativePath="..\..\include\wx\types.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\textbuf.h"/>
+				RelativePath="..\..\include\wx\unichar.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\textfile.h"/>
+				RelativePath="..\..\include\wx\uri.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\thread.h"/>
+				RelativePath="..\..\include\wx\ustring.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\timer.h"/>
+				RelativePath="..\..\include\wx\utils.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\tokenzr.h"/>
+				RelativePath="..\..\include\wx\variant.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\tracker.h"/>
+				RelativePath="..\..\include\wx\vector.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\txtstrm.h"/>
+				RelativePath="..\..\include\wx\version.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\types.h"/>
+				RelativePath="..\..\include\wx\versioninfo.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\unichar.h"/>
+				RelativePath="..\..\include\wx\volume.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\uri.h"/>
+				RelativePath="..\..\include\wx\weakref.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\utils.h"/>
+				RelativePath="..\..\include\wx\wfstream.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\variant.h"/>
+				RelativePath="..\..\include\wx\wx.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\vector.h"/>
+				RelativePath="..\..\include\wx\wxchar.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\version.h"/>
+				RelativePath="..\..\include\wx\wxcrt.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\volume.h"/>
+				RelativePath="..\..\include\wx\wxcrtbase.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\weakref.h"/>
+				RelativePath="..\..\include\wx\wxcrtvararg.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\wfstream.h"/>
+				RelativePath="..\..\include\wx\wxprec.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\wx.h"/>
+				RelativePath="..\..\include\wx\xlocale.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\wxchar.h"/>
+				RelativePath="..\..\include\wx\xti.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\wxcrt.h"/>
+				RelativePath="..\..\include\wx\xti2.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\wxcrtbase.h"/>
+				RelativePath="..\..\include\wx\xtictor.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\wxcrtvararg.h"/>
+				RelativePath="..\..\include\wx\xtihandler.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\wxprec.h"/>
+				RelativePath="..\..\include\wx\xtiprop.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xti.h"/>
+				RelativePath="..\..\include\wx\xtistrm.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\xtistrm.h"/>
+				RelativePath="..\..\include\wx\xtitypes.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\zipstrm.h"/>
+				RelativePath="..\..\include\wx\zipstrm.h">
+			</File>
 			<File
-				RelativePath="..\..\include\wx\zstream.h"/>
+				RelativePath="..\..\include\wx\zstream.h">
+			</File>
 		</Filter>
 	</Files>
 	<Globals>