X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e662c3157e7e2150c14825f6a828eef585d00cf1..76e7cfab8fdb0c7862fd07e427af54181717fc62:/build/msw/wx_vc8_base.vcproj?ds=sidebyside

diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj
index 2e8b411ada..4647b1ecfb 100644
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_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!
 
 -->
@@ -22,101 +22,10 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="DLL Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivudll\base"
-			ConfigurationType="2"
-			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="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=""
-				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"
-				UsePrecompiledHeader="2"
-				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"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<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"
-			/>
-			<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"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_vc_custom.pdb"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc8_base.bsc"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="DLL Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivuddll\base"
-			ConfigurationType="2"
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswud\base"
+			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
@@ -134,66 +43,60 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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="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"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
 				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"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				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_mswud\wxprec_baselib.pch"
+				ObjectFile="vc_mswud\base\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;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"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;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="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"
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxbase29ud.lib"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290ud_vc_custom.pdb"
-				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc8_base.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_base.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -204,10 +107,10 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswudll\base"
-			ConfigurationType="2"
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswu\base"
+			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
@@ -225,66 +128,57 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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="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"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
 				ExceptionHandling="1"
-				AdditionalOptions=""
 				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"
 				UsePrecompiledHeader="2"
 				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_mswu\wxprec_baselib.pch"
+				ObjectFile="vc_mswu\base\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;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"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;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="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"
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxbase29u.lib"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateManifest="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_vc_custom.pdb"
-				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc8_base.bsc"
+				OutputFile="..\..\lib\vc_lib\wx_vc8_base.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -316,60 +210,63 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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="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="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
 				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				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"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
 			/>
 			<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"
+				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"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290ud_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -386,10 +283,10 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivu\base"
-			ConfigurationType="4"
+			Name="DLL Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswudll\base"
+			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
@@ -407,303 +304,68 @@
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
 			<Tool
-				Name="VCIDLTool"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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="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"
+				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;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
 				ExceptionHandling="1"
-				AdditionalOptions=""
 				RuntimeLibrary="2"
-				PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				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"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;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"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;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="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxbase29u.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc8_base.bsc"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivud\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\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
+				Name="VCLinkerTool"
 				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswunivud\wxprec_baselib.pch"
-				AssemblerListingLocation="vc_mswunivud\base\"
-				ObjectFile="vc_mswunivud\base\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud.pdb"
-				WarningLevel="4"
+				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"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase295u_vc_custom.pdb"
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 			/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<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"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxbase29ud.lib"
-				SuppressStartupBanner="true"
+				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCALinkTool"
+				Name="VCManifestTool"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc8_base.bsc"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswu\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="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=""
-				RuntimeLibrary="2"
-				PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu\wxprec_baselib.pch"
-				AssemblerListingLocation="vc_mswu\base\"
-				ObjectFile="vc_mswu\base\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u.pdb"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<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"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc8_base.bsc"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<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="2"
-				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"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				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"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc8_base.bsc"
+				OutputFile="..\..\lib\vc_dll\wx_vc8_base.bsc"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -722,58 +384,71 @@
 			Name="Common Sources"
 			UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}"
 			>
+			<File
+				RelativePath="..\..\src\common\any.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\appbase.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\arcall.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\arcfind.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\archive.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\arrstr.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\base64.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\clntdata.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\cmdline.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\config.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\convauto.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\datetime.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\datetimefmt.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\datstrm.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\dircmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\dummy.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -781,7 +456,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -797,31 +472,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -831,35 +482,33 @@
 			</File>
 			<File
 				RelativePath="..\..\src\common\dynarray.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\dynlib.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\dynload.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\encconv.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\event.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\evtloopcmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\extended.c"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -867,7 +516,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -883,31 +532,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -917,181 +542,272 @@
 			</File>
 			<File
 				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\fmapbase.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\fs_arc.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\fs_filter.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\fs_mem.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\fswatchercmn.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\hash.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\hashmap.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\init.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\intl.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\ipcbase.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\languageinfo.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\list.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\log.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\longlong.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\memory.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\mimecmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\module.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\msgout.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\mstream.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\numformatter.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\object.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\platinfo.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\powercmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\process.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\regex.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\sstream.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\stdpbase.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\stdstream.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\stopwatch.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\strconv.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\stream.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\string.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\stringimpl.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\stringops.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\strvararg.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\sysopt.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\tarstrm.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\textbuf.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\textfile.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\time.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\timercmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\timerimpl.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\tokenzr.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\translation.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\txtstrm.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\unichar.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\uri.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\ustring.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\utilscmn.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\variant.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\wfstream.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\wxcrt.cpp"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\wxprintf.cpp"
+				>
+			</File>
 			<File
-				RelativePath="..\..\src\common\wxprintf.cpp"
-			/>
+				RelativePath="..\..\src\common\xlocale.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\xti.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\xtistrm.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\zipstrm.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\zstream.cpp"
-			/>
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="MSW Sources"
@@ -1099,87 +815,113 @@
 			>
 			<File
 				RelativePath="..\..\src\msw\basemsw.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\crashrpt.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\dde.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\debughlp.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\dir.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\dlmsw.cpp"
-			/>
+				>
+			</File>
 			<File
-				RelativePath="..\..\src\msw\evtloop.cpp"
-			/>
+				RelativePath="..\..\src\msw\evtloopconsole.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\fswatcher.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\main.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\mimetype.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\mslu.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\power.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\regconf.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\registry.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\snglinst.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\stackwalk.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\stdpaths.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\thread.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\timer.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\utils.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\utilsexc.cpp"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\version.rc"
 				>
 				<FileConfiguration
-					Name="Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="true"
 				/>
-				<FileConfiguration
-					Name="Debug|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\generic\fswatcherg.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Setup Headers"
@@ -1189,39 +931,15 @@
 				RelativePath="..\..\include\wx\msw\setup.h"
 				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-				/>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-				/>
-				<FileConfiguration
-					Name="DLL Release|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="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|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="$(SOURCE) &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="Universal Release|Win32"
-				/>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-				/>
 				<FileConfiguration
 					Name="Release|Win32"
 					>
@@ -1230,79 +948,43 @@
 						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="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|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="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
 					/>
 				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\setup.h"
-				>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="DLL 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="$(SOURCE) &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="DLL Universal Debug|Win32"
+					Name="DLL 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="$(SOURCE) &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>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\setup.h"
+				>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 				/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 				/>
 				<FileConfiguration
-					Name="Universal Release|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="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|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="$(SOURCE) &quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 				/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 				/>
 			</File>
 		</Filter>
@@ -1312,59 +994,63 @@
 			>
 			<File
 				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\crashrpt.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\dde.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\debughlp.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\evtloopconsole.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\fswatcher.h"
+				>
+			</File>
 			<File
 				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;$(SOURCE)&quot; &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;$(SOURCE)&quot; &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;$(SOURCE)&quot; &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
@@ -1375,93 +1061,82 @@
 						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;$(SOURCE)&quot; &quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;$(SOURCE)&quot; &quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal 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;$(SOURCE)&quot; &quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="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;$(SOURCE)&quot; &quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|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;$(SOURCE)&quot; &quot;..\..\lib\vc_lib\mswud\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>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\libraries.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\mimetype.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\mslu.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\private.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\regconf.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\registry.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\seh.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\stackwalk.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\stdpaths.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\winundef.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\wrapcctl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\wrapcdlg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\wrapwin.h"
-			/>
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Generic Headers"
+			UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"
+			>
+			<File
+				RelativePath="..\..\include\wx\generic\fswatcher.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="wxHTML Headers"
@@ -1469,7 +1144,8 @@
 			>
 			<File
 				RelativePath="..\..\include\wx\html\forcelnk.h"
-			/>
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Common Headers"
@@ -1477,382 +1153,640 @@
 			>
 			<File
 				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\compiler.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\dynarray.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dynlib.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dynload.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\encconv.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\event.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\eventfilter.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\evtloop.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\except.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\features.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\ffile.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\file.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\fileconf.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\filefn.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\filename.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\filesys.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\flags.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\fontenc.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\fontmap.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\fs_arc.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\fs_filter.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\fs_mem.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\fs_zip.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\fswatcher.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\hash.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\hashmap.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\hashset.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\iconloc.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\meta\if.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\meta\implicitconversion.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\init.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\meta\int2type.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\intl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\iosfwrap.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\ioswrap.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\ipc.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\ipcbase.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\kbdstate.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\language.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\link.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\list.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\log.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\longlong.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\math.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\memconf.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\memory.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\memtext.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\mimetype.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\module.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\mousestate.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\meta\movable.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msgout.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msgqueue.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\mstream.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\numformatter.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\object.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\platform.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\platinfo.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\meta\pod.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\power.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\process.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\ptr_scpd.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\ptr_shrd.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\recguard.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\regex.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\meta\removeref.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\rtti.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\scopedarray.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\scopedptr.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\scopeguard.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\sharedptr.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\snglinst.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\sstream.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\stack.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\stackwalk.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\stdpaths.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\stdstream.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\stockitem.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\stopwatch.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\strconv.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\stream.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\string.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\stringimpl.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\stringops.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\strvararg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\sysopt.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\tarstrm.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\textbuf.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\textfile.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\thread.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\time.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\timer.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\tls.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\tokenzr.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\tracker.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\translation.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\txtstrm.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\typeinfo.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\types.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\unichar.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\uri.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\ustring.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\utils.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\variant.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\vector.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\version.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\versioninfo.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\volume.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\weakref.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\wfstream.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\wx.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\wxchar.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\wxcrt.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\wxcrtbase.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\wxcrtvararg.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\wxprec.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xlocale.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xti.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xti2.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xtictor.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xtihandler.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xtiprop.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xtistrm.h"
-			/>
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xtitypes.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\zipstrm.h"
-			/>
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\zstream.h"
-			/>
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>