using button impl

[wxWidgets.git] / build / msw / wx_vc7_base.vcproj

diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj
index 51c44a86594a14b1bd4dc1dc955b98dd1132d572..6b9cb0d6d03b2f22a5ac3e0b01ff65066fbde915 100644 (file)
--- a/build/msw/wx_vc7_base.vcproj
+++ b/build/msw/wx_vc7_base.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r

 <!--\r
 \r
 <!--\r
 \r

-  This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  This project was generated by\r
+  Bakefile 0.2.9 (http://www.bakefile.org)\r

   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r


@@ -17,226 +17,238 @@
        </Platforms>\r
        <Configurations>\r
                <Configuration\r
        </Platforms>\r
        <Configurations>\r
                <Configuration\r

-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivudll\base"\r
-                       ConfigurationType="2"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswud\base"\r
+                       ConfigurationType="4"\r

                        UseOfMFC="0"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        <Tool\r
                        CharacterSet="1">\r
                        <Tool\r

-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               UsePrecompiledHeader="3"\r
+                               PrecompiledHeaderThrough="wx/wxprec.h"\r
+                               PrecompiledHeaderFile="vc_mswud\wxprec_baselib.pch"\r
+                               ObjectFile="vc_mswud\base\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r

-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxbase29ud.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r

                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r

-                               Name="VCIDLTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswu\base"\r
+                       ConfigurationType="4"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               ExceptionHandling="TRUE"\r

                                RuntimeLibrary="2"\r
                                RuntimeLibrary="2"\r

-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_basedll.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\base\"\r
-                               ObjectFile="vc_mswunivudll\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290u_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\wxprec_baselib.pch"\r
+                               ObjectFile="vc_mswu\base\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u.pdb"\r

                                WarningLevel="4"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxbase29u.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r

-                               Name="VCLinkerTool"\r
-                               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"\r
-                               AdditionalOptions=""\r
-                               OutputFile="..\..\lib\vc_dll\wxbase290u_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"\r
-                               SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_vc_custom.pdb"\r
-                               TargetMachine="1"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc7_base.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivuddll\base"\r
-                       ConfigurationType="2"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivud\base"\r
+                       ConfigurationType="4"\r

                        UseOfMFC="0"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_basedll.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\base\"\r
-                               ObjectFile="vc_mswunivuddll\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\wxprec_baselib.pch"\r
+                               ObjectFile="vc_mswunivud\base\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud.pdb"\r

                                WarningLevel="4"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxbase29ud.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r

-                               Name="VCLinkerTool"\r
-                               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"\r
-                               AdditionalOptions=""\r
-                               OutputFile="..\..\lib\vc_dll\wxbase290ud_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290ud_vc_custom.pdb"\r
-                               TargetMachine="1"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc7_base.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswudll\base"\r
-                       ConfigurationType="2"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivu\base"\r
+                       ConfigurationType="4"\r

                        UseOfMFC="0"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               ExceptionHandling="TRUE"\r

                                RuntimeLibrary="2"\r
                                RuntimeLibrary="2"\r

-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswudll\wxprec_basedll.pch"\r
-                               AssemblerListingLocation="vc_mswudll\base\"\r
-                               ObjectFile="vc_mswudll\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290u_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\wxprec_baselib.pch"\r
+                               ObjectFile="vc_mswunivu\base\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u.pdb"\r

                                WarningLevel="4"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxbase29u.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r

-                               Name="VCLinkerTool"\r
-                               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"\r
-                               AdditionalOptions=""\r
-                               OutputFile="..\..\lib\vc_dll\wxbase290u_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"\r
-                               SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_vc_custom.pdb"\r
-                               TargetMachine="1"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc7_base.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r


@@ -244,337 +256,269 @@
                        IntermediateDirectory="vc_mswuddll\base"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswuddll\base"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch"\r

-                               AssemblerListingLocation="vc_mswuddll\base\"\r

                                ObjectFile="vc_mswuddll\base\"\r
                                ObjectFile="vc_mswuddll\base\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                                Name="VCLinkerTool"\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               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"\r

                                AdditionalOptions=""\r
                                AdditionalOptions=""\r

-                               OutputFile="..\..\lib\vc_dll\wxbase290ud_vc_custom.dll"\r
+                               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"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase295ud_vc_custom.dll"\r

                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"\r

-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r

                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r

-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290ud_vc_custom.pdb"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb"\r

                                TargetMachine="1"/>\r
                        <Tool\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"/>\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc7_base.bsc"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCFxCopTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r

                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r

-               </Configuration>\r
-               <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\base"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1">\r

                        <Tool\r
                                Name="VCPreBuildEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPreBuildEventTool"/>\r
                        <Tool\r

-                               Name="VCCustomBuildTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r

                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r

-                               Name="VCIDLTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswudll\base"\r
+                       ConfigurationType="2"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               ExceptionHandling="TRUE"\r

                                RuntimeLibrary="2"\r
                                RuntimeLibrary="2"\r

-                               PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswunivu\wxprec_baselib.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\base\"\r
-                               ObjectFile="vc_mswunivu\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\wxprec_basedll.pch"\r
+                               ObjectFile="vc_mswudll\base\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase295u_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"/>\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               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"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase295u_vc_custom.dll"\r
+                               LinkIncremental="1"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"\r
+                               SuppressStartupBanner="TRUE"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase295u_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxbase29u.lib"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc7_base.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                </Configuration>\r
                <Configuration\r

-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivud\base"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivuddll\base"\r
+                       ConfigurationType="2"\r

                        UseOfMFC="0"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswunivud\wxprec_baselib.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\base\"\r
-                               ObjectFile="vc_mswunivud\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_basedll.pch"\r
+                               ObjectFile="vc_mswunivuddll\base\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"/>\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               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"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase295ud_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"\r
+                               SuppressStartupBanner="TRUE"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb"\r
+                               TargetMachine="1"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxbase29ud.lib"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc7_base.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                </Configuration>\r
                <Configuration\r

-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswu\base"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivudll\base"\r
+                       ConfigurationType="2"\r

                        UseOfMFC="0"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               ExceptionHandling="TRUE"\r

                                RuntimeLibrary="2"\r
                                RuntimeLibrary="2"\r

-                               PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswu\wxprec_baselib.pch"\r
-                               AssemblerListingLocation="vc_mswu\base\"\r
-                               ObjectFile="vc_mswu\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_basedll.pch"\r
+                               ObjectFile="vc_mswunivudll\base\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase295u_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxbase29u.lib"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCALinkTool"/>\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc7_base.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               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"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase295u_vc_custom.dll"\r
+                               LinkIncremental="1"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"\r
+                               SuppressStartupBanner="TRUE"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase295u_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r

                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r

-               </Configuration>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswud\base"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1">\r

                        <Tool\r
                                Name="VCPreBuildEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPreBuildEventTool"/>\r
                        <Tool\r

-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="3"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\wxprec_baselib.pch"\r
-                               AssemblerListingLocation="vc_mswud\base\"\r
-                               ObjectFile="vc_mswud\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxbase29ud.lib"\r
-                               SuppressStartupBanner="true"/>\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc7_base.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
        </Configurations>\r
        <References>\r
                </Configuration>\r
        </Configurations>\r
        <References>\r


@@ -585,324 +529,463 @@
                        Name="Common Sources"\r
                        UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}">\r
                        <File\r
                        Name="Common Sources"\r
                        UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}">\r
                        <File\r

-                               RelativePath="..\..\src\common\appbase.cpp"/>\r
+                               RelativePath="..\..\src\common\any.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\arcall.cpp"/>\r
+                               RelativePath="..\..\src\common\appbase.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\arcfind.cpp"/>\r
+                               RelativePath="..\..\src\common\arcall.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\archive.cpp"/>\r
+                               RelativePath="..\..\src\common\arcfind.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\arrstr.cpp"/>\r
+                               RelativePath="..\..\src\common\archive.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\base64.cpp"/>\r
+                               RelativePath="..\..\src\common\arrstr.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\clntdata.cpp"/>\r
+                               RelativePath="..\..\src\common\base64.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\cmdline.cpp"/>\r
+                               RelativePath="..\..\src\common\clntdata.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\config.cpp"/>\r
+                               RelativePath="..\..\src\common\cmdline.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\convauto.cpp"/>\r
+                               RelativePath="..\..\src\common\config.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\datetime.cpp"/>\r
+                               RelativePath="..\..\src\common\convauto.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\datetime.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\datstrm.cpp"/>\r
+                               RelativePath="..\..\src\common\datetimefmt.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\datstrm.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\dircmn.cpp"/>\r
+                               RelativePath="..\..\src\common\dircmn.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\dummy.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\common\dummy.cpp">\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32">\r
+                                       Name="Debug|Win32">\r

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Debug|Win32">\r
+                                       Name="Release|Win32">\r

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32">\r
+                                       Name="Universal Debug|Win32">\r

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Debug|Win32">\r
+                                       Name="Universal Release|Win32">\r

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Universal Release|Win32">\r
+                                       Name="DLL Debug|Win32">\r

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Universal Debug|Win32">\r
+                                       Name="DLL Release|Win32">\r

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Release|Win32">\r
+                                       Name="DLL Universal Debug|Win32">\r

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32">\r
+                                       Name="DLL Universal Release|Win32">\r

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\common\dynarray.cpp"/>\r
+                               RelativePath="..\..\src\common\dynarray.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\dynlib.cpp"/>\r
+                               RelativePath="..\..\src\common\dynlib.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\dynload.cpp"/>\r
+                               RelativePath="..\..\src\common\dynload.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\encconv.cpp"/>\r
+                               RelativePath="..\..\src\common\encconv.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\event.cpp"/>\r
+                               RelativePath="..\..\src\common\event.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\evtloopcmn.cpp"/>\r
+                               RelativePath="..\..\src\common\evtloopcmn.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\extended.c">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\common\extended.c">\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32">\r
+                                       Name="Debug|Win32">\r

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Debug|Win32">\r
+                                       Name="Release|Win32">\r

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32">\r
+                                       Name="Universal Debug|Win32">\r

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Debug|Win32">\r
+                                       Name="Universal Release|Win32">\r

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Universal Release|Win32">\r
+                                       Name="DLL Debug|Win32">\r

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Universal Debug|Win32">\r
+                                       Name="DLL Release|Win32">\r

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Release|Win32">\r
+                                       Name="DLL Universal Debug|Win32">\r

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32">\r
+                                       Name="DLL Universal Release|Win32">\r

                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                                UsePrecompiledHeader="0"/>\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\common\ffile.cpp"/>\r
+                               RelativePath="..\..\src\common\ffile.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\file.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\fileback.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\fileconf.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\filefn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\filename.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\filesys.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\filtall.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\filtfind.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\file.cpp"/>\r
+                               RelativePath="..\..\src\common\fmapbase.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\fileback.cpp"/>\r
+                               RelativePath="..\..\src\common\fs_arc.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\fileconf.cpp"/>\r
+                               RelativePath="..\..\src\common\fs_filter.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\filefn.cpp"/>\r
+                               RelativePath="..\..\src\common\fs_mem.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\filename.cpp"/>\r
+                               RelativePath="..\..\src\common\fswatchercmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\filesys.cpp"/>\r
+                               RelativePath="..\..\src\common\hash.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\filtall.cpp"/>\r
+                               RelativePath="..\..\src\common\hashmap.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\filtfind.cpp"/>\r
+                               RelativePath="..\..\src\common\init.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\fmapbase.cpp"/>\r
+                               RelativePath="..\..\src\common\intl.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\fs_arc.cpp"/>\r
+                               RelativePath="..\..\src\common\ipcbase.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\fs_filter.cpp"/>\r
+                               RelativePath="..\..\src\common\languageinfo.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\fs_mem.cpp"/>\r
+                               RelativePath="..\..\src\common\list.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\hash.cpp"/>\r
+                               RelativePath="..\..\src\common\log.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\hashmap.cpp"/>\r
+                               RelativePath="..\..\src\common\longlong.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\init.cpp"/>\r
+                               RelativePath="..\..\src\common\memory.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\intl.cpp"/>\r
+                               RelativePath="..\..\src\common\mimecmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\ipcbase.cpp"/>\r
+                               RelativePath="..\..\src\common\module.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\list.cpp"/>\r
+                               RelativePath="..\..\src\common\msgout.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\log.cpp"/>\r
+                               RelativePath="..\..\src\common\mstream.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\longlong.cpp"/>\r
+                               RelativePath="..\..\src\common\numformatter.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\memory.cpp"/>\r
+                               RelativePath="..\..\src\common\object.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\mimecmn.cpp"/>\r
+                               RelativePath="..\..\src\common\platinfo.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\module.cpp"/>\r
+                               RelativePath="..\..\src\common\powercmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\msgout.cpp"/>\r
+                               RelativePath="..\..\src\common\process.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\mstream.cpp"/>\r
+                               RelativePath="..\..\src\common\regex.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\object.cpp"/>\r
+                               RelativePath="..\..\src\common\sstream.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\platinfo.cpp"/>\r
+                               RelativePath="..\..\src\common\stdpbase.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\powercmn.cpp"/>\r
+                               RelativePath="..\..\src\common\stdstream.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\process.cpp"/>\r
+                               RelativePath="..\..\src\common\stopwatch.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\regex.cpp"/>\r
+                               RelativePath="..\..\src\common\strconv.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\sstream.cpp"/>\r
+                               RelativePath="..\..\src\common\stream.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\stdpbase.cpp"/>\r
+                               RelativePath="..\..\src\common\string.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\stopwatch.cpp"/>\r
+                               RelativePath="..\..\src\common\stringimpl.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\strconv.cpp"/>\r
+                               RelativePath="..\..\src\common\stringops.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\stream.cpp"/>\r
+                               RelativePath="..\..\src\common\strvararg.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\string.cpp"/>\r
+                               RelativePath="..\..\src\common\sysopt.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\stringimpl.cpp"/>\r
+                               RelativePath="..\..\src\common\tarstrm.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\stringops.cpp"/>\r
+                               RelativePath="..\..\src\common\textbuf.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\strvararg.cpp"/>\r
+                               RelativePath="..\..\src\common\textfile.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\sysopt.cpp"/>\r
+                               RelativePath="..\..\src\common\time.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\tarstrm.cpp"/>\r
+                               RelativePath="..\..\src\common\timercmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\textbuf.cpp"/>\r
+                               RelativePath="..\..\src\common\timerimpl.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\textfile.cpp"/>\r
+                               RelativePath="..\..\src\common\tokenzr.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\timercmn.cpp"/>\r
+                               RelativePath="..\..\src\common\translation.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\timerimpl.cpp"/>\r
+                               RelativePath="..\..\src\common\txtstrm.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\tokenzr.cpp"/>\r
+                               RelativePath="..\..\src\common\unichar.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\txtstrm.cpp"/>\r
+                               RelativePath="..\..\src\common\uri.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\unichar.cpp"/>\r
+                               RelativePath="..\..\src\common\ustring.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\uri.cpp"/>\r
+                               RelativePath="..\..\src\common\utilscmn.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\utilscmn.cpp"/>\r
+                               RelativePath="..\..\src\common\variant.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\variant.cpp"/>\r
+                               RelativePath="..\..\src\common\wfstream.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\wfstream.cpp"/>\r
+                               RelativePath="..\..\src\common\wxcrt.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\wxcrt.cpp"/>\r
+                               RelativePath="..\..\src\common\wxprintf.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\wxprintf.cpp"/>\r
+                               RelativePath="..\..\src\common\xlocale.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\xti.cpp"/>\r
+                               RelativePath="..\..\src\common\xti.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\xtistrm.cpp"/>\r
+                               RelativePath="..\..\src\common\xtistrm.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\zipstrm.cpp"/>\r
+                               RelativePath="..\..\src\common\zipstrm.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\common\zstream.cpp"/>\r
+                               RelativePath="..\..\src\common\zstream.cpp">\r
+                       </File>\r

                </Filter>\r
                <Filter\r
                        Name="MSW Sources"\r
                        UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">\r
                        <File\r
                </Filter>\r
                <Filter\r
                        Name="MSW Sources"\r
                        UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">\r
                        <File\r

-                               RelativePath="..\..\src\msw\basemsw.cpp"/>\r
+                               RelativePath="..\..\src\msw\basemsw.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\crashrpt.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\crashrpt.cpp"/>\r
+                               RelativePath="..\..\src\msw\dde.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\dde.cpp"/>\r
+                               RelativePath="..\..\src\msw\debughlp.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\debughlp.cpp"/>\r
+                               RelativePath="..\..\src\msw\dir.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\dir.cpp"/>\r
+                               RelativePath="..\..\src\msw\dlmsw.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\dlmsw.cpp"/>\r
+                               RelativePath="..\..\src\msw\evtloopconsole.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\evtloop.cpp"/>\r
+                               RelativePath="..\..\src\msw\fswatcher.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\main.cpp"/>\r
+                               RelativePath="..\..\src\msw\main.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\mimetype.cpp"/>\r
+                               RelativePath="..\..\src\msw\mimetype.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\mslu.cpp"/>\r
+                               RelativePath="..\..\src\msw\mslu.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\power.cpp"/>\r
+                               RelativePath="..\..\src\msw\power.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\regconf.cpp"/>\r
+                               RelativePath="..\..\src\msw\regconf.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\registry.cpp"/>\r
+                               RelativePath="..\..\src\msw\registry.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\snglinst.cpp"/>\r
+                               RelativePath="..\..\src\msw\snglinst.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\stackwalk.cpp"/>\r
+                               RelativePath="..\..\src\msw\stackwalk.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\stdpaths.cpp"/>\r
+                               RelativePath="..\..\src\msw\stdpaths.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\thread.cpp"/>\r
+                               RelativePath="..\..\src\msw\thread.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\timer.cpp"/>\r
+                               RelativePath="..\..\src\msw\timer.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\utils.cpp"/>\r
+                               RelativePath="..\..\src\msw\utils.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\utilsexc.cpp"/>\r
+                               RelativePath="..\..\src\msw\utilsexc.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\version.rc">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\src\msw\version.rc">\r
                                <FileConfiguration\r

-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"/>\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r

                                <FileConfiguration\r
                                        Name="Release|Win32"\r
                                <FileConfiguration\r
                                        Name="Release|Win32"\r

-                                       ExcludedFromBuild="true"/>\r
+                                       ExcludedFromBuild="TRUE"/>\r

                                <FileConfiguration\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"/>\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\volume.cpp">\r

                        </File>\r
                        </File>\r

+               </Filter>\r
+               <Filter\r
+                       Name="Generic Sources"\r
+                       UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}">\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\msw\volume.cpp"/>\r
+                               RelativePath="..\..\src\generic\fswatcherg.cpp">\r
+                       </File>\r

                </Filter>\r
                <Filter\r
                        Name="Setup Headers"\r
                </Filter>\r
                <Filter\r
                        Name="Setup Headers"\r


@@ -910,152 +993,148 @@
                        <File\r
                                RelativePath="..\..\include\wx\msw\setup.h">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\setup.h">\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32">\r
+                                       Name="Debug|Win32">\r

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Debug|Win32">\r
+                                       Name="Release|Win32">\r

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"/>\r

                                </FileConfiguration>\r
                                </FileConfiguration>\r

-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"/>\r

                                <FileConfiguration\r
                                        Name="Universal Debug|Win32"/>\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="Universal Debug|Win32"/>\r
                                <FileConfiguration\r

-                                       Name="Release|Win32">\r
+                                       Name="Universal Release|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32">\r

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32">\r
+                                       Name="DLL Release|Win32">\r

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"/>\r

                                </FileConfiguration>\r
                                </FileConfiguration>\r

+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"/>\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\univ\setup.h">\r
                                <FileConfiguration\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\univ\setup.h">\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32">\r
+                                       Name="Debug|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32">\r

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Debug|Win32">\r
+                                       Name="Universal Release|Win32">\r

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"/>\r

                                </FileConfiguration>\r
                                </FileConfiguration>\r

-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"/>\r

                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"/>\r
                                <FileConfiguration\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"/>\r
                                <FileConfiguration\r

-                                       Name="Universal Release|Win32">\r
+                                       Name="DLL Release|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32">\r

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Universal Debug|Win32">\r
+                                       Name="DLL Universal Release|Win32">\r

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"/>\r

                                </FileConfiguration>\r
                                </FileConfiguration>\r

-                               <FileConfiguration\r
-                                       Name="Release|Win32"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"/>\r

                        </File>\r
                </Filter>\r
                <Filter\r
                        Name="MSW Headers"\r
                        UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}">\r
                        <File\r
                        </File>\r
                </Filter>\r
                <Filter\r
                        Name="MSW Headers"\r
                        UniqueIdentifier="{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}">\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\apptbase.h"/>\r
+                               RelativePath="..\..\include\wx\msw\apptbase.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\apptrait.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\chkconf.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\apptrait.h"/>\r
+                               RelativePath="..\..\include\wx\msw\crashrpt.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\chkconf.h"/>\r
+                               RelativePath="..\..\include\wx\msw\dde.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\crashrpt.h"/>\r
+                               RelativePath="..\..\include\wx\msw\debughlp.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\dde.h"/>\r
+                               RelativePath="..\..\include\wx\msw\evtloopconsole.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\debughlp.h"/>\r
+                               RelativePath="..\..\include\wx\msw\fswatcher.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\gccpriv.h"/>\r
+                               RelativePath="..\..\include\wx\msw\gccpriv.h">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\genrcdefs.h">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\genrcdefs.h">\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32">\r
+                                       Name="Debug|Win32">\r

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32">\r
+                                       Name="Release|Win32">\r

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Debug|Win32">\r
+                                       Name="Universal Debug|Win32">\r

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Universal Release|Win32">\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Universal Release|Win32">\r


@@ -1067,321 +1146,573 @@
                                                AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                                AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"/>\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Universal Debug|Win32">\r
+                                       Name="DLL Debug|Win32">\r

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Release|Win32">\r
+                                       Name="DLL Release|Win32">\r

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"/>\r

                                </FileConfiguration>\r
                                <FileConfiguration\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32">\r
+                                       Name="DLL Universal Debug|Win32">\r

                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"/>\r

                                </FileConfiguration>\r
                        </File>\r
                        <File\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\libraries.h"/>\r
+                               RelativePath="..\..\include\wx\msw\libraries.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\mimetype.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\mimetype.h"/>\r
+                               RelativePath="..\..\include\wx\msw\mslu.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\mslu.h"/>\r
+                               RelativePath="..\..\include\wx\msw\private.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\private.h"/>\r
+                               RelativePath="..\..\include\wx\msw\regconf.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\regconf.h"/>\r
+                               RelativePath="..\..\include\wx\msw\registry.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\registry.h"/>\r
+                               RelativePath="..\..\include\wx\msw\seh.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\seh.h"/>\r
+                               RelativePath="..\..\include\wx\msw\stackwalk.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\stackwalk.h"/>\r
+                               RelativePath="..\..\include\wx\msw\stdpaths.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\stdpaths.h"/>\r
+                               RelativePath="..\..\include\wx\msw\winundef.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\winundef.h"/>\r
+                               RelativePath="..\..\include\wx\msw\wrapcctl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\wrapcctl.h"/>\r
+                               RelativePath="..\..\include\wx\msw\wrapcdlg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\wrapcdlg.h"/>\r
+                               RelativePath="..\..\include\wx\msw\wrapwin.h">\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Generic Headers"\r
+                       UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}">\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\wrapwin.h"/>\r
+                               RelativePath="..\..\include\wx\generic\fswatcher.h">\r
+                       </File>\r

                </Filter>\r
                <Filter\r
                        Name="wxHTML Headers"\r
                        UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}">\r
                        <File\r
                </Filter>\r
                <Filter\r
                        Name="wxHTML Headers"\r
                        UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}">\r
                        <File\r

-                               RelativePath="..\..\include\wx\html\forcelnk.h"/>\r
+                               RelativePath="..\..\include\wx\html\forcelnk.h">\r
+                       </File>\r

                </Filter>\r
                <Filter\r
                        Name="Common Headers"\r
                        UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">\r
                        <File\r
                </Filter>\r
                <Filter\r
                        Name="Common Headers"\r
                        UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">\r
                        <File\r

-                               RelativePath="..\..\include\wx\afterstd.h"/>\r
+                               RelativePath="..\..\include\wx\afterstd.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\any.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\anystr.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\app.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\apptrait.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\archive.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\arrstr.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\atomic.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\base64.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\beforestd.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\buffer.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\build.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\chartype.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\checkeddelete.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\chkconf.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\clntdata.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\cmdargs.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\cmdline.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\confbase.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\config.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\containr.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\convauto.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\meta\convertible.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\cpp.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\crt.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\datetime.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\datstrm.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dde.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\debug.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\defs.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dir.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dlimpexp.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dlist.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\app.h"/>\r
+                               RelativePath="..\..\include\wx\dynarray.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\apptrait.h"/>\r
+                               RelativePath="..\..\include\wx\dynlib.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\archive.h"/>\r
+                               RelativePath="..\..\include\wx\dynload.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\arrstr.h"/>\r
+                               RelativePath="..\..\include\wx\encconv.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\atomic.h"/>\r
+                               RelativePath="..\..\include\wx\event.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\base64.h"/>\r
+                               RelativePath="..\..\include\wx\eventfilter.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\beforestd.h"/>\r
+                               RelativePath="..\..\include\wx\evtloop.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\buffer.h"/>\r
+                               RelativePath="..\..\include\wx\except.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\build.h"/>\r
+                               RelativePath="..\..\include\wx\features.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\chartype.h"/>\r
+                               RelativePath="..\..\include\wx\ffile.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\chkconf.h"/>\r
+                               RelativePath="..\..\include\wx\file.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\clntdata.h"/>\r
+                               RelativePath="..\..\include\wx\fileconf.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\cmdargs.h"/>\r
+                               RelativePath="..\..\include\wx\filefn.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\cmdline.h"/>\r
+                               RelativePath="..\..\include\wx\filename.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\confbase.h"/>\r
+                               RelativePath="..\..\include\wx\filesys.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\config.h"/>\r
+                               RelativePath="..\..\include\wx\flags.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\containr.h"/>\r
+                               RelativePath="..\..\include\wx\fontenc.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\convauto.h"/>\r
+                               RelativePath="..\..\include\wx\fontmap.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\meta\convertible.h"/>\r
+                               RelativePath="..\..\include\wx\fs_arc.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\cpp.h"/>\r
+                               RelativePath="..\..\include\wx\fs_filter.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\crt.h"/>\r
+                               RelativePath="..\..\include\wx\fs_mem.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\datetime.h"/>\r
+                               RelativePath="..\..\include\wx\fs_zip.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\datstrm.h"/>\r
+                               RelativePath="..\..\include\wx\fswatcher.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dde.h"/>\r
+                               RelativePath="..\..\include\wx\hash.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\debug.h"/>\r
+                               RelativePath="..\..\include\wx\hashmap.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\defs.h"/>\r
+                               RelativePath="..\..\include\wx\hashset.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dir.h"/>\r
+                               RelativePath="..\..\include\wx\iconloc.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dlimpexp.h"/>\r
+                               RelativePath="..\..\include\wx\meta\if.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dynarray.h"/>\r
+                               RelativePath="..\..\include\wx\meta\implicitconversion.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dynlib.h"/>\r
+                               RelativePath="..\..\include\wx\init.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\dynload.h"/>\r
+                               RelativePath="..\..\include\wx\meta\int2type.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\encconv.h"/>\r
+                               RelativePath="..\..\include\wx\intl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\event.h"/>\r
+                               RelativePath="..\..\include\wx\iosfwrap.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\except.h"/>\r
+                               RelativePath="..\..\include\wx\ioswrap.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\features.h"/>\r
+                               RelativePath="..\..\include\wx\ipc.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\ffile.h"/>\r
+                               RelativePath="..\..\include\wx\ipcbase.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\file.h"/>\r
+                               RelativePath="..\..\include\wx\kbdstate.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\fileconf.h"/>\r
+                               RelativePath="..\..\include\wx\language.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\filefn.h"/>\r
+                               RelativePath="..\..\include\wx\link.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\filename.h"/>\r
+                               RelativePath="..\..\include\wx\list.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\filesys.h"/>\r
+                               RelativePath="..\..\include\wx\log.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\flags.h"/>\r
+                               RelativePath="..\..\include\wx\longlong.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\fontenc.h"/>\r
+                               RelativePath="..\..\include\wx\math.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\fontmap.h"/>\r
+                               RelativePath="..\..\include\wx\memconf.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\fs_arc.h"/>\r
+                               RelativePath="..\..\include\wx\memory.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\fs_filter.h"/>\r
+                               RelativePath="..\..\include\wx\memtext.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\fs_mem.h"/>\r
+                               RelativePath="..\..\include\wx\mimetype.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\fs_zip.h"/>\r
+                               RelativePath="..\..\include\wx\module.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\hash.h"/>\r
+                               RelativePath="..\..\include\wx\mousestate.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\hashmap.h"/>\r
+                               RelativePath="..\..\include\wx\meta\movable.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\hashset.h"/>\r
+                               RelativePath="..\..\include\wx\msgout.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\iconloc.h"/>\r
+                               RelativePath="..\..\include\wx\msgqueue.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\meta\if.h"/>\r
+                               RelativePath="..\..\include\wx\mstream.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\init.h"/>\r
+                               RelativePath="..\..\include\wx\numformatter.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\meta\int2type.h"/>\r
+                               RelativePath="..\..\include\wx\object.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\intl.h"/>\r
+                               RelativePath="..\..\include\wx\platform.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\iosfwrap.h"/>\r
+                               RelativePath="..\..\include\wx\platinfo.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\ioswrap.h"/>\r
+                               RelativePath="..\..\include\wx\meta\pod.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\ipc.h"/>\r
+                               RelativePath="..\..\include\wx\power.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\ipcbase.h"/>\r
+                               RelativePath="..\..\include\wx\process.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\link.h"/>\r
+                               RelativePath="..\..\include\wx\ptr_scpd.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\list.h"/>\r
+                               RelativePath="..\..\include\wx\ptr_shrd.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\log.h"/>\r
+                               RelativePath="..\..\include\wx\recguard.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\longlong.h"/>\r
+                               RelativePath="..\..\include\wx\regex.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\math.h"/>\r
+                               RelativePath="..\..\include\wx\meta\removeref.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\memconf.h"/>\r
+                               RelativePath="..\..\include\wx\rtti.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\memory.h"/>\r
+                               RelativePath="..\..\include\wx\scopedarray.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\memtext.h"/>\r
+                               RelativePath="..\..\include\wx\scopedptr.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\mimetype.h"/>\r
+                               RelativePath="..\..\include\wx\scopeguard.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\module.h"/>\r
+                               RelativePath="..\..\include\wx\sharedptr.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\meta\movable.h"/>\r
+                               RelativePath="..\..\include\wx\snglinst.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\msgout.h"/>\r
+                               RelativePath="..\..\include\wx\sstream.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\mstream.h"/>\r
+                               RelativePath="..\..\include\wx\stack.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\object.h"/>\r
+                               RelativePath="..\..\include\wx\stackwalk.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\platform.h"/>\r
+                               RelativePath="..\..\include\wx\stdpaths.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\platinfo.h"/>\r
+                               RelativePath="..\..\include\wx\stdstream.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\power.h"/>\r
+                               RelativePath="..\..\include\wx\stockitem.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\process.h"/>\r
+                               RelativePath="..\..\include\wx\stopwatch.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\ptr_scpd.h"/>\r
+                               RelativePath="..\..\include\wx\strconv.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\ptr_shrd.h"/>\r
+                               RelativePath="..\..\include\wx\stream.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\recguard.h"/>\r
+                               RelativePath="..\..\include\wx\string.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\regex.h"/>\r
+                               RelativePath="..\..\include\wx\stringimpl.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\scopeguard.h"/>\r
+                               RelativePath="..\..\include\wx\stringops.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\snglinst.h"/>\r
+                               RelativePath="..\..\include\wx\strvararg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\sstream.h"/>\r
+                               RelativePath="..\..\include\wx\sysopt.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\stack.h"/>\r
+                               RelativePath="..\..\include\wx\tarstrm.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\stackwalk.h"/>\r
+                               RelativePath="..\..\include\wx\textbuf.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\stdpaths.h"/>\r
+                               RelativePath="..\..\include\wx\textfile.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\stockitem.h"/>\r
+                               RelativePath="..\..\include\wx\thread.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\stopwatch.h"/>\r
+                               RelativePath="..\..\include\wx\time.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\strconv.h"/>\r
+                               RelativePath="..\..\include\wx\timer.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\stream.h"/>\r
+                               RelativePath="..\..\include\wx\tls.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\string.h"/>\r
+                               RelativePath="..\..\include\wx\tokenzr.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\stringimpl.h"/>\r
+                               RelativePath="..\..\include\wx\tracker.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\stringops.h"/>\r
+                               RelativePath="..\..\include\wx\translation.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\strvararg.h"/>\r
+                               RelativePath="..\..\include\wx\txtstrm.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\sysopt.h"/>\r
+                               RelativePath="..\..\include\wx\typeinfo.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\tarstrm.h"/>\r
+                               RelativePath="..\..\include\wx\types.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\textbuf.h"/>\r
+                               RelativePath="..\..\include\wx\unichar.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\textfile.h"/>\r
+                               RelativePath="..\..\include\wx\uri.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\thread.h"/>\r
+                               RelativePath="..\..\include\wx\ustring.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\timer.h"/>\r
+                               RelativePath="..\..\include\wx\utils.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\tokenzr.h"/>\r
+                               RelativePath="..\..\include\wx\variant.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\tracker.h"/>\r
+                               RelativePath="..\..\include\wx\vector.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\txtstrm.h"/>\r
+                               RelativePath="..\..\include\wx\version.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\types.h"/>\r
+                               RelativePath="..\..\include\wx\versioninfo.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\unichar.h"/>\r
+                               RelativePath="..\..\include\wx\volume.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\uri.h"/>\r
+                               RelativePath="..\..\include\wx\weakref.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\utils.h"/>\r
+                               RelativePath="..\..\include\wx\wfstream.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\variant.h"/>\r
+                               RelativePath="..\..\include\wx\wx.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\vector.h"/>\r
+                               RelativePath="..\..\include\wx\wxchar.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\version.h"/>\r
+                               RelativePath="..\..\include\wx\wxcrt.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\volume.h"/>\r
+                               RelativePath="..\..\include\wx\wxcrtbase.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\weakref.h"/>\r
+                               RelativePath="..\..\include\wx\wxcrtvararg.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\wfstream.h"/>\r
+                               RelativePath="..\..\include\wx\wxprec.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\wx.h"/>\r
+                               RelativePath="..\..\include\wx\xlocale.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\wxchar.h"/>\r
+                               RelativePath="..\..\include\wx\xti.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\wxcrt.h"/>\r
+                               RelativePath="..\..\include\wx\xti2.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\wxcrtbase.h"/>\r
+                               RelativePath="..\..\include\wx\xtictor.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\wxcrtvararg.h"/>\r
+                               RelativePath="..\..\include\wx\xtihandler.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\wxprec.h"/>\r
+                               RelativePath="..\..\include\wx\xtiprop.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xti.h"/>\r
+                               RelativePath="..\..\include\wx\xtistrm.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\xtistrm.h"/>\r
+                               RelativePath="..\..\include\wx\xtitypes.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\zipstrm.h"/>\r
+                               RelativePath="..\..\include\wx\zipstrm.h">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\include\wx\zstream.h"/>\r
+                               RelativePath="..\..\include\wx\zstream.h">\r
+                       </File>\r

                </Filter>\r
        </Files>\r
        <Globals>\r
                </Filter>\r
        </Files>\r
        <Globals>\r