better docs for Get/SetLabel methods

[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 a9ae6c9abc2c2a16ca42c32fa1ec882b3f6b25e4..e124bcebb08d124f74fe880eb002938dfa0091e9 100644 (file)
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <!--\r
 \r
-  This makefile was generated by\r
-  Bakefile 0.2.5 (http://www.bakefile.org)\r
+  This project was generated by\r
+  Bakefile 0.2.8 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -22,10 +22,10 @@
        </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
@@ -44,21 +44,25 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\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="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\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
                                Detect64BitPortabilityProblems="true"\r
@@ -69,26 +73,17 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\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
+                               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
-                               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\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
-                               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
@@ -101,7 +96,7 @@
                        />\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
@@ -112,10 +107,10 @@
                        />\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
@@ -134,24 +129,22 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\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="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
                                ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\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
                                Detect64BitPortabilityProblems="true"\r
@@ -162,26 +155,17 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               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
-                               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\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
-                               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
@@ -194,7 +178,7 @@
                        />\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
@@ -205,10 +189,10 @@
                        />\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
@@ -227,21 +211,25 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\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="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\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
                                Detect64BitPortabilityProblems="true"\r
@@ -252,26 +240,17 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               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
-                               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\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
-                               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
@@ -284,7 +263,7 @@
                        />\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
@@ -295,10 +274,10 @@
                        />\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
@@ -317,24 +296,22 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\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="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
                                ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\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
                                Detect64BitPortabilityProblems="true"\r
@@ -345,26 +322,17 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase290ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               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
-                               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\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
-                               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
@@ -377,7 +345,7 @@
                        />\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
@@ -388,10 +356,10 @@
                        />\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
@@ -410,21 +378,25 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\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="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\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;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\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\wxbase291ud_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -435,17 +407,26 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase291ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               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
-                               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\wxbase291ud_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"\r
                                SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291ud_vc_custom.pdb"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -458,7 +439,7 @@
                        />\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
@@ -469,10 +450,10 @@
                        />\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
@@ -491,24 +472,22 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\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="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\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;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
                                ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\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\wxbase291u_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -519,17 +498,28 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase291u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               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
-                               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\wxbase291u_vc_custom.dll"\r
+                               LinkIncremental="1"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"\r
                                SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291u_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -542,7 +532,7 @@
                        />\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
@@ -553,10 +543,10 @@
                        />\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
@@ -575,21 +565,25 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\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="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\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;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\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\wxbase291ud_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -600,17 +594,26 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase291ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               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
-                               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\wxbase291ud_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"\r
                                SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291ud_vc_custom.pdb"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -623,7 +626,7 @@
                        />\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
@@ -634,10 +637,10 @@
                        />\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
@@ -656,24 +659,22 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\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;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
                                ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\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\wxbase291u_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -684,17 +685,28 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase291u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               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
-                               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\wxbase291u_vc_custom.dll"\r
+                               LinkIncremental="1"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"\r
                                SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase291u_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -707,7 +719,7 @@
                        />\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
@@ -726,6 +738,10 @@
                        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
                                >\r
@@ -770,6 +786,10 @@
                                RelativePath="..\..\src\common\datetime.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\datetimefmt.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\datstrm.cpp"\r
                                >\r
@@ -782,7 +802,7 @@
                                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
@@ -790,7 +810,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -798,7 +818,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -806,7 +826,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -814,7 +834,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -822,7 +842,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -830,7 +850,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -838,7 +858,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -874,7 +894,7 @@
                                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
@@ -882,7 +902,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -890,7 +910,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -898,7 +918,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -906,7 +926,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -914,7 +934,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -922,7 +942,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -930,7 +950,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -990,6 +1010,10 @@
                                RelativePath="..\..\src\common\fs_mem.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\fswatchercmn.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\hash.cpp"\r
                                >\r
@@ -1070,6 +1094,10 @@
                                RelativePath="..\..\src\common\stdpbase.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\stdstream.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\stopwatch.cpp"\r
                                >\r
@@ -1215,6 +1243,10 @@
                                RelativePath="..\..\src\msw\evtloop.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\fswatcher.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\main.cpp"\r
                                >\r
@@ -1271,19 +1303,19 @@
                                RelativePath="..\..\src\msw\version.rc"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1292,6 +1324,15 @@
                                >\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
                        UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}"\r
@@ -1300,121 +1341,121 @@
                                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
-                                               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
+                                               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
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\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
+                                               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
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\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
+                                               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
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\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
+                                               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
                                        />\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
-                                       Name="DLL Universal Release|Win32"\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_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
+                                               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
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\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
+                                               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
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\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
+                                               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
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|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
+                                               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
                                        />\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                               />\r
                        </File>\r
                </Filter>\r
                <Filter\r
@@ -1445,6 +1486,10 @@
                                RelativePath="..\..\include\wx\msw\debughlp.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
                                >\r
@@ -1453,91 +1498,91 @@
                                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
-                                               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
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\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
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\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
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\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
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\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
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\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
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\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
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\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
@@ -1594,6 +1639,15 @@
                                >\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
                        UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}"\r
@@ -1611,6 +1665,14 @@
                                RelativePath="..\..\include\wx\afterstd.h"\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
                                >\r
@@ -1651,6 +1713,10 @@
                                RelativePath="..\..\include\wx\chartype.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\checkeddelete.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\chkconf.h"\r
                                >\r
@@ -1747,6 +1813,10 @@
                                RelativePath="..\..\include\wx\event.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\evtloop.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\except.h"\r
                                >\r
@@ -1807,6 +1877,10 @@
                                RelativePath="..\..\include\wx\fs_zip.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\fswatcher.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\hash.h"\r
                                >\r
@@ -1951,10 +2025,22 @@
                                RelativePath="..\..\include\wx\regex.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
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\sharedptr.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\snglinst.h"\r
                                >\r
@@ -1975,6 +2061,10 @@
                                RelativePath="..\..\include\wx\stdpaths.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\stdstream.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\stockitem.h"\r
                                >\r
@@ -2047,6 +2137,10 @@
                                RelativePath="..\..\include\wx\txtstrm.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\typeinfo.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\types.h"\r
                                >\r