using button impl

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

diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj
index ea94390207da3c72fb4c5657cebc4754b4630242..a6faa005262f6612c16824bcb50d05bd1a18635a 100644 (file)
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_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


@@ -22,10 +22,10 @@
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
        </ToolFiles>\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
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -43,66 +43,60 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\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
+                               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;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               MinimalRebuild="true"\r

                                ExceptionHandling="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r

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

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

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\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_mswud\wxprec_baselib.pch"\r
+                               ObjectFile="vc_mswud\base\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r

                                Culture="1033"\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
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\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
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxbase29ud.lib"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_vc_custom.pdb"\r
-                               TargetMachine="1"\r

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

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_dll\wx_vc8_base.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_base.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -113,10 +107,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\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="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
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -134,66 +128,57 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\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
+                               Optimization="2"\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;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r

                                ExceptionHandling="1"\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
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="2"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\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_mswu\wxprec_baselib.pch"\r
+                               ObjectFile="vc_mswu\base\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r

                                Culture="1033"\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
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\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
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxbase29u.lib"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290ud_vc_custom.pdb"\r
-                               TargetMachine="1"\r

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

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_dll\wx_vc8_base.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_base.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -204,10 +189,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\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 Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivud\base"\r
+                       ConfigurationType="4"\r

                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -225,66 +210,60 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\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
+                               Optimization="0"\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;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               MinimalRebuild="true"\r

                                ExceptionHandling="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r

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

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

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\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_mswunivud\wxprec_baselib.pch"\r
+                               ObjectFile="vc_mswunivud\base\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r

                                Culture="1033"\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
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\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
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxbase29ud.lib"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290u_vc_custom.pdb"\r
-                               TargetMachine="1"\r

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

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_dll\wx_vc8_base.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_base.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -295,10 +274,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswuddll\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
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -316,66 +295,57 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\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
-                               MinimalRebuild="true"\r
+                               Optimization="2"\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;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r

                                ExceptionHandling="1"\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
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="2"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\base\"\r
-                               ObjectFile="vc_mswuddll\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase290ud_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
                                SuppressStartupBanner="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r

                                Culture="1033"\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
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\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
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxbase29u.lib"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase290ud_vc_custom.pdb"\r
-                               TargetMachine="1"\r

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

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_dll\wx_vc8_base.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_base.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -386,10 +356,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

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

                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -407,57 +377,69 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\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
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               MinimalRebuild="true"\r

                                ExceptionHandling="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r

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

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

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\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_mswuddll\wxprec_basedll.pch"\r
+                               ObjectFile="vc_mswuddll\base\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r

                                Culture="1033"\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
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

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

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxbase29u.lib"\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
                                SuppressStartupBanner="true"\r

+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb"\r
+                               TargetMachine="1"\r

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

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_lib\wx_vc8_base.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_base.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -468,10 +450,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\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 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
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -489,57 +471,68 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\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
+                               Optimization="2"\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;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r

                                ExceptionHandling="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="2"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\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_mswudll\wxprec_basedll.pch"\r
+                               ObjectFile="vc_mswudll\base\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase295u_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

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

                                Culture="1033"\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
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

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

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxbase29ud.lib"\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
                                SuppressStartupBanner="true"\r

+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase295u_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r

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

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_lib\wx_vc8_base.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_base.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -550,10 +543,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\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 Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivuddll\base"\r
+                       ConfigurationType="2"\r

                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -571,57 +564,69 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\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
+                               Optimization="0"\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;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               MinimalRebuild="true"\r

                                ExceptionHandling="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r

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

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

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\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_mswunivuddll\wxprec_basedll.pch"\r
+                               ObjectFile="vc_mswunivuddll\base\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase295ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r

                                Culture="1033"\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
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

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

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxbase29u.lib"\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
                                SuppressStartupBanner="true"\r

+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase295ud_vc_custom.pdb"\r
+                               TargetMachine="1"\r

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

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_lib\wx_vc8_base.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_base.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -632,10 +637,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswud\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
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -653,57 +658,68 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\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
+                               Optimization="2"\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;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r

                                ExceptionHandling="1"\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
+                               RuntimeLibrary="2"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\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
+                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_basedll.pch"\r
+                               ObjectFile="vc_mswunivudll\base\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase295u_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

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

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxbase29ud.lib"\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
                                SuppressStartupBanner="true"\r

+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase295u_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r

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

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_lib\wx_vc8_base.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_base.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -722,50 +738,71 @@
                        Name="Common Sources"\r
                        UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}"\r
                        >\r
                        Name="Common Sources"\r
                        UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}"\r
                        >\r

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

                        <File\r
                                RelativePath="..\..\src\common\appbase.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\appbase.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\arcall.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\arcall.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\arcfind.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\arcfind.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\archive.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\archive.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\arrstr.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\arrstr.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\base64.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\base64.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\clntdata.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\clntdata.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\cmdline.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\cmdline.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\config.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\config.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\convauto.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\convauto.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\datetime.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\datetime.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\common\datstrm.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\datstrm.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\dircmn.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\dircmn.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

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

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -773,7 +810,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -781,7 +818,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -789,7 +826,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -797,7 +834,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -805,7 +842,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -813,7 +850,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -821,7 +858,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -831,27 +868,33 @@
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\common\dynarray.cpp"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\common\dynarray.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\dynlib.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\dynlib.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\dynload.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\dynload.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\encconv.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\encconv.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\event.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\event.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\evtloopcmn.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\evtloopcmn.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

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

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -859,7 +902,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -867,7 +910,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -875,7 +918,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -883,7 +926,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -891,7 +934,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -899,7 +942,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -907,7 +950,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -917,187 +960,272 @@
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\common\ffile.cpp"\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\common\ffile.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\file.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\file.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\fileback.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\fileback.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\fileconf.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\fileconf.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\filefn.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\filefn.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\filename.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\filename.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\filesys.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\filesys.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\filtall.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\filtall.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\filtfind.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\filtfind.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\fmapbase.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\fmapbase.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\fs_arc.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\fs_arc.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\fs_filter.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\fs_filter.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\fs_mem.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\fs_mem.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\common\hash.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\hash.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\hashmap.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\hashmap.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\init.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\init.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\intl.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\intl.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\ipcbase.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\ipcbase.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\common\list.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\list.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\log.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\log.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\longlong.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\longlong.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\memory.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\memory.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\mimecmn.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\mimecmn.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\module.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\module.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\msgout.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\msgout.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\mstream.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\mstream.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\common\object.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\object.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\platinfo.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\platinfo.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\powercmn.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\powercmn.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\process.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\process.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\regex.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\regex.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\sstream.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\sstream.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\stdpbase.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\stdpbase.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\common\stopwatch.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\stopwatch.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\strconv.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\strconv.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\stream.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\stream.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\string.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\string.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\stringimpl.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\stringimpl.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\stringops.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\stringops.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\strvararg.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\strvararg.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\sysopt.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\sysopt.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\tarstrm.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\tarstrm.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\textbuf.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\textbuf.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\textfile.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\textfile.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\common\timercmn.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\timercmn.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\timerimpl.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\timerimpl.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\tokenzr.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\tokenzr.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\common\txtstrm.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\txtstrm.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\unichar.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\unichar.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\uri.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\uri.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\ustring.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\ustring.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\utilscmn.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\utilscmn.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\variant.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\variant.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\wfstream.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\wfstream.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\wxcrt.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\wxcrt.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\wxprintf.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\wxprintf.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\xlocale.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\xlocale.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\xti.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\xti.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\xtistrm.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\xtistrm.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\zipstrm.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\zipstrm.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\common\zstream.cpp"\r
                        <File\r
                                RelativePath="..\..\src\common\zstream.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                </Filter>\r
                <Filter\r
                        Name="MSW Sources"\r
                </Filter>\r
                <Filter\r
                        Name="MSW Sources"\r


@@ -1105,87 +1233,121 @@
                        >\r
                        <File\r
                                RelativePath="..\..\src\msw\basemsw.cpp"\r
                        >\r
                        <File\r
                                RelativePath="..\..\src\msw\basemsw.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\crashrpt.cpp"\r
                        <File\r
                                RelativePath="..\..\src\msw\crashrpt.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\dde.cpp"\r
                        <File\r
                                RelativePath="..\..\src\msw\dde.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\debughlp.cpp"\r
                        <File\r
                                RelativePath="..\..\src\msw\debughlp.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\dir.cpp"\r
                        <File\r
                                RelativePath="..\..\src\msw\dir.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\dlmsw.cpp"\r
                        <File\r
                                RelativePath="..\..\src\msw\dlmsw.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                        <File\r

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

                        <File\r
                                RelativePath="..\..\src\msw\main.cpp"\r
                        <File\r
                                RelativePath="..\..\src\msw\main.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\mimetype.cpp"\r
                        <File\r
                                RelativePath="..\..\src\msw\mimetype.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\mslu.cpp"\r
                        <File\r
                                RelativePath="..\..\src\msw\mslu.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\power.cpp"\r
                        <File\r
                                RelativePath="..\..\src\msw\power.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\regconf.cpp"\r
                        <File\r
                                RelativePath="..\..\src\msw\regconf.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\registry.cpp"\r
                        <File\r
                                RelativePath="..\..\src\msw\registry.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\snglinst.cpp"\r
                        <File\r
                                RelativePath="..\..\src\msw\snglinst.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\stackwalk.cpp"\r
                        <File\r
                                RelativePath="..\..\src\msw\stackwalk.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\stdpaths.cpp"\r
                        <File\r
                                RelativePath="..\..\src\msw\stdpaths.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\thread.cpp"\r
                        <File\r
                                RelativePath="..\..\src\msw\thread.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\timer.cpp"\r
                        <File\r
                                RelativePath="..\..\src\msw\timer.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\utils.cpp"\r
                        <File\r
                                RelativePath="..\..\src\msw\utils.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\msw\utilsexc.cpp"\r
                        <File\r
                                RelativePath="..\..\src\msw\utilsexc.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

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

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

                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

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

                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

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

                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

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

                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\volume.cpp"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\volume.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Generic Sources"\r
+                       UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\generic\fswatcherg.cpp"\r
+                               >\r
+                       </File>\r

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


@@ -1195,121 +1357,113 @@
                                RelativePath="..\..\include\wx\msw\setup.h"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\include\wx\msw\setup.h"\r
                                >\r
                                <FileConfiguration\r

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\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

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

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\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

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

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

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

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

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

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\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

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

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\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

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

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

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

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

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

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\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

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

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

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

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

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

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\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

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

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\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

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

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

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


@@ -1318,156 +1472,193 @@
                        >\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\apptbase.h"\r
                        >\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\apptbase.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\apptrait.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\apptrait.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\chkconf.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\chkconf.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\crashrpt.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\crashrpt.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\dde.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\dde.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\debughlp.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\debughlp.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\msw\gccpriv.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\gccpriv.h"\r

-                       />\r
+                               >\r
+                       </File>\r

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

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\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
+                                               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

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

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\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\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

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

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\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\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

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

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\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\mswunivu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"\r

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

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

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

-                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\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

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

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\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\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

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

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\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\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

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

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

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\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\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

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

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\mimetype.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\mimetype.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\mslu.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\mslu.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\private.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\private.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\regconf.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\regconf.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\registry.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\registry.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\seh.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\seh.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\stackwalk.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\stackwalk.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\stdpaths.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\stdpaths.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\winundef.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\winundef.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\wrapcctl.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\wrapcctl.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\wrapcdlg.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\wrapcdlg.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\msw\wrapwin.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\wrapwin.h"\r

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

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


@@ -1475,7 +1666,8 @@
                        >\r
                        <File\r
                                RelativePath="..\..\include\wx\html\forcelnk.h"\r
                        >\r
                        <File\r
                                RelativePath="..\..\include\wx\html\forcelnk.h"\r

-                       />\r
+                               >\r
+                       </File>\r

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


@@ -1483,391 +1675,636 @@
                        >\r
                        <File\r
                                RelativePath="..\..\include\wx\afterstd.h"\r
                        >\r
                        <File\r
                                RelativePath="..\..\include\wx\afterstd.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\app.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\app.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\apptrait.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\apptrait.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\archive.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\archive.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\arrstr.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\arrstr.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\atomic.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\atomic.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\base64.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\base64.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\beforestd.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\beforestd.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\buffer.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\buffer.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\build.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\build.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\chartype.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\chartype.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\chkconf.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\chkconf.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\clntdata.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\clntdata.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\cmdargs.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\cmdargs.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\cmdline.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\cmdline.h"\r

-                       />\r
-                       <File\r
+                               >\r
+                       </File>\r
+                       <File\r

                                RelativePath="..\..\include\wx\confbase.h"\r
                                RelativePath="..\..\include\wx\confbase.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\config.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\config.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\containr.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\containr.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\convauto.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\convauto.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\meta\convertible.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\meta\convertible.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\cpp.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\cpp.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\crt.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\crt.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\datetime.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\datetime.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\datstrm.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\datstrm.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\dde.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\dde.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\debug.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\debug.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\defs.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\defs.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\dir.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\dir.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\dlimpexp.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\dlimpexp.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\dlist.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\dlist.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\dynarray.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\dynarray.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\dynlib.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\dynlib.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\dynload.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\dynload.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\encconv.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\encconv.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\event.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\event.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\except.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\except.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\features.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\features.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\ffile.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\ffile.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\file.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\file.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\fileconf.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\fileconf.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\filefn.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\filefn.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\filename.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\filename.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\filesys.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\filesys.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\flags.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\flags.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\fontenc.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\fontenc.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\fontmap.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\fontmap.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\fs_arc.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\fs_arc.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\fs_filter.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\fs_filter.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\fs_mem.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\fs_mem.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\fs_zip.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\fs_zip.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\hash.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\hash.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\hashmap.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\hashmap.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\hashset.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\hashset.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\iconloc.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\iconloc.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\meta\if.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\meta\if.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\init.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\init.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\meta\int2type.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\meta\int2type.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\intl.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\intl.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\iosfwrap.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\iosfwrap.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\ioswrap.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\ioswrap.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\ipc.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\ipc.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\ipcbase.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\ipcbase.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\link.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\link.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\list.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\list.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\log.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\log.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\longlong.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\longlong.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\math.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\math.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\memconf.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\memconf.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\memory.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\memory.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\memtext.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\memtext.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\mimetype.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\mimetype.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\module.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\module.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\meta\movable.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\meta\movable.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\msgout.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msgout.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\mstream.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\mstream.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\object.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\object.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\platform.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\platform.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\platinfo.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\platinfo.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\power.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\power.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\process.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\process.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\ptr_scpd.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\ptr_scpd.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\ptr_shrd.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\ptr_shrd.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\recguard.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\recguard.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\regex.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\regex.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\scopeguard.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\scopeguard.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\snglinst.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\snglinst.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\sstream.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\sstream.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\stack.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\stack.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\stackwalk.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\stackwalk.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\stdpaths.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\stdpaths.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\stockitem.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\stockitem.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\stopwatch.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\stopwatch.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\strconv.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\strconv.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\stream.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\stream.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\string.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\string.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\stringimpl.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\stringimpl.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\stringops.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\stringops.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\strvararg.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\strvararg.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\sysopt.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\sysopt.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\tarstrm.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\tarstrm.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\textbuf.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\textbuf.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\textfile.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\textfile.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\thread.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\thread.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\timer.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\timer.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\tokenzr.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\tokenzr.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\tracker.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\tracker.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\txtstrm.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\txtstrm.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\types.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\types.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\unichar.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\unichar.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\uri.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\uri.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\ustring.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\ustring.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\utils.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\utils.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\variant.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\variant.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\vector.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\vector.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\version.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\version.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\volume.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\volume.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\weakref.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\weakref.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\wfstream.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\wfstream.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\wx.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\wx.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\wxchar.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\wxchar.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\wxcrt.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\wxcrt.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\wxcrtbase.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\wxcrtbase.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\wxcrtvararg.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\wxcrtvararg.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\wxprec.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\wxprec.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\xlocale.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\xlocale.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\xti.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\xti.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\xtistrm.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\xtistrm.h"\r

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

                        <File\r
                                RelativePath="..\..\include\wx\zipstrm.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\zipstrm.h"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\zstream.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\zstream.h"\r

-                       />\r
+                               >\r
+                       </File>\r

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