Don't use a destroy event handler to disconnect the native control's delegate as...

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

diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index 3e6620b5005621821a752303a53041ed87b3d8b7..be3c1bf554216d712b1c7de7aa0d259ea75ce2f5 100644 (file)
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.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,94 @@
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivudll\core"\r
-                       ConfigurationType="2"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswud\core"\r
+                       ConfigurationType="4"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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
+                               AdditionalOptions="/MP"\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_BASE=0"\r
+                               ExceptionHandling="1"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
+                               RuntimeTypeInfo="true"\r
+                               UsePrecompiledHeader="2"\r
+                               PrecompiledHeaderThrough="wx/wxprec.h"\r
+                               PrecompiledHeaderFile="vc_mswud\wxprec_corelib.pch"\r
+                               ObjectFile="vc_mswud\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_core.pdb"\r
+                               WarningLevel="4"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc9_core.bsc"\r
+                               SuppressStartupBanner="true"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswu\core"\r
+                       ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
@@ -43,23 +127,24 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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
                                AdditionalOptions="/MP"\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;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\core\"\r
-                               ObjectFile="vc_mswunivudll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\wxprec_corelib.pch"\r
+                               ObjectFile="vc_mswu\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_core.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -69,26 +154,17 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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\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="wxtiff.lib wxjpeg.lib wxpng.lib  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 ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"\r
-                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -101,7 +177,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc9_core.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc9_core.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -112,10 +188,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivuddll\core"\r
-                       ConfigurationType="2"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivud\core"\r
+                       ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
@@ -133,14 +209,16 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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
                                AdditionalOptions="/MP"\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;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=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_BASE=0"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -148,10 +226,9 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\core\"\r
-                               ObjectFile="vc_mswunivuddll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\wxprec_corelib.pch"\r
+                               ObjectFile="vc_mswunivud\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_core.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -161,26 +238,17 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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\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="wxtiffd.lib wxjpegd.lib wxpngd.lib  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 ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r
-                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -193,7 +261,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc9_core.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc9_core.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -204,10 +272,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswudll\core"\r
-                       ConfigurationType="2"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivu\core"\r
+                       ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
@@ -225,23 +293,24 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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
                                AdditionalOptions="/MP"\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;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"\r
-                               AssemblerListingLocation="vc_mswudll\core\"\r
-                               ObjectFile="vc_mswudll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\wxprec_corelib.pch"\r
+                               ObjectFile="vc_mswunivu\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_core.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -251,26 +320,17 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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\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="wxtiff.lib wxjpeg.lib wxpng.lib  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 ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"\r
-                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -283,7 +343,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc9_core.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc9_core.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -315,14 +375,16 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                                AdditionalOptions="/MP"\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;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -331,9 +393,8 @@
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\core\"\r
                                ObjectFile="vc_mswuddll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291ud_core_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -343,7 +404,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                        />\r
@@ -353,15 +414,15 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  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 ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll"\r
+                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  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 ..\..\lib\vc_dll\wxbase29ud.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw291ud_core_vc_custom.dll"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291ud_core_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
@@ -386,10 +447,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\core"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswudll\core"\r
+                       ConfigurationType="2"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
@@ -407,23 +468,24 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                                AdditionalOptions="/MP"\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_BASE=0"\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__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\wxprec_corelib.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\core\"\r
-                               ObjectFile="vc_mswunivu\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_core.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"\r
+                               ObjectFile="vc_mswudll\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291u_core_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -433,17 +495,28 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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\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\wxmswuniv29u_core.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  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 ..\..\lib\vc_dll\wxbase29u.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw291u_core_vc_custom.dll"\r
+                               LinkIncremental="1"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"\r
                                SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_core_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -456,7 +529,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc9_core.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc9_core.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -467,10 +540,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivud\core"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivuddll\core"\r
+                       ConfigurationType="2"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
@@ -488,14 +561,16 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                                AdditionalOptions="/MP"\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_BASE=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;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -503,10 +578,9 @@
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\wxprec_corelib.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\core\"\r
-                               ObjectFile="vc_mswunivud\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_core.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"\r
+                               ObjectFile="vc_mswunivuddll\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291ud_core_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -516,17 +590,26 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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\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\wxmswuniv29ud_core.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  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 ..\..\lib\vc_dll\wxbase29ud.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv291ud_core_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"\r
                                SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291ud_core_vc_custom.pdb"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -539,7 +622,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc9_core.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc9_core.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -550,10 +633,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswu\core"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivudll\core"\r
+                       ConfigurationType="2"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
@@ -571,23 +654,24 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                                AdditionalOptions="/MP"\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_BASE=0"\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__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\wxprec_corelib.pch"\r
-                               AssemblerListingLocation="vc_mswu\core\"\r
-                               ObjectFile="vc_mswu\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_core.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"\r
+                               ObjectFile="vc_mswunivudll\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -597,100 +681,28 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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\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\wxmsw29u_core.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc9_core.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswud\core"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalOptions="/MP"\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_BASE=0"\r
-                               ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswud\wxprec_corelib.pch"\r
-                               AssemblerListingLocation="vc_mswud\core\"\r
-                               ObjectFile="vc_mswud\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_core.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  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 ..\..\lib\vc_dll\wxbase29u.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.dll"\r
+                               LinkIncremental="1"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
                                SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -703,7 +715,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc9_core.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc9_core.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -858,7 +870,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
@@ -866,7 +878,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -874,7 +886,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -882,7 +894,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -890,7 +902,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -898,7 +910,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -906,7 +918,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -914,7 +926,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -1086,6 +1098,10 @@
                                RelativePath="..\..\src\common\menucmn.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\mousemanager.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\msgout.cpp"\r
                                >\r
@@ -1102,6 +1118,10 @@
                                RelativePath="..\..\src\common\paper.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\persist.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\pickerbase.cpp"\r
                                >\r
@@ -1223,11 +1243,23 @@
                                RelativePath="..\..\src\msw\accel.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
@@ -1235,50 +1267,54 @@
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\ole\access.cpp"\r
-                               >\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\msw\ole\activex.cpp"\r
+                               RelativePath="..\..\src\msw\ole\access.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\ole\activex.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\app.cpp"\r
                                >\r
@@ -1287,19 +1323,19 @@
                                RelativePath="..\..\src\msw\artmsw.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1315,19 +1351,51 @@
                                RelativePath="..\..\src\msw\bmpbuttn.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1339,19 +1407,51 @@
                                RelativePath="..\..\src\msw\button.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1363,19 +1463,51 @@
                                RelativePath="..\..\src\msw\checkbox.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
                                        Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1383,19 +1515,51 @@
                                RelativePath="..\..\src\msw\checklst.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1403,19 +1567,51 @@
                                RelativePath="..\..\src\msw\choice.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1427,19 +1623,19 @@
                                RelativePath="..\..\src\msw\colordlg.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1451,19 +1647,19 @@
                                RelativePath="..\..\src\msw\combo.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1471,19 +1667,51 @@
                                RelativePath="..\..\src\msw\combobox.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1491,19 +1719,51 @@
                                RelativePath="..\..\src\msw\control.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1543,19 +1803,51 @@
                                RelativePath="..\..\src\msw\dialog.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1571,19 +1863,19 @@
                                RelativePath="..\..\src\msw\dirdlg.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1595,19 +1887,19 @@
                                RelativePath="..\..\src\msw\dragimag.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1631,19 +1923,51 @@
                                RelativePath="..\..\src\msw\fdrepdlg.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1651,19 +1975,19 @@
                                RelativePath="..\..\src\msw\filedlg.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1675,19 +1999,19 @@
                                RelativePath="..\..\src\msw\fontdlg.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1703,19 +2027,19 @@
                                RelativePath="..\..\src\msw\frame.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1723,19 +2047,51 @@
                                RelativePath="..\..\src\msw\gauge.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1759,19 +2115,19 @@
                                RelativePath="..\..\src\msw\headerctrl.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1795,19 +2151,19 @@
                                RelativePath="..\..\src\msw\iniconf.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1815,19 +2171,51 @@
                                RelativePath="..\..\src\msw\listbox.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1835,19 +2223,51 @@
                                RelativePath="..\..\src\msw\listctrl.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1859,19 +2279,19 @@
                                RelativePath="..\..\src\msw\mdi.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1879,19 +2299,51 @@
                                RelativePath="..\..\src\msw\menu.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1899,19 +2351,19 @@
                                RelativePath="..\..\src\msw\menuitem.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1919,19 +2371,19 @@
                                RelativePath="..\..\src\msw\metafile.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1943,19 +2395,19 @@
                                RelativePath="..\..\src\msw\msgdlg.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1967,19 +2419,19 @@
                                RelativePath="..\..\src\msw\nativdlg.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -1987,19 +2439,19 @@
                                RelativePath="..\..\src\msw\nativewin.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2007,19 +2459,51 @@
                                RelativePath="..\..\src\msw\notebook.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2031,19 +2515,19 @@
                                RelativePath="..\..\src\msw\ownerdrw.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2071,19 +2555,51 @@
                                RelativePath="..\..\src\msw\radiobox.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2091,19 +2607,51 @@
                                RelativePath="..\..\src\msw\radiobut.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2119,19 +2667,51 @@
                                RelativePath="..\..\src\msw\scrolbar.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2143,19 +2723,51 @@
                                RelativePath="..\..\src\msw\slider.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2163,11 +2775,23 @@
                                RelativePath="..\..\src\msw\spinbutt.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
@@ -2175,87 +2799,203 @@
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\spinctrl.cpp"\r
-                               >\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\msw\statbmp.cpp"\r
+                               RelativePath="..\..\src\msw\spinctrl.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\msw\statbox.cpp"\r
+                               RelativePath="..\..\src\msw\statbmp.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\statbox.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\statline.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2263,19 +3003,51 @@
                                RelativePath="..\..\src\msw\stattext.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2283,19 +3055,19 @@
                                RelativePath="..\..\src\msw\statusbar.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2303,19 +3075,51 @@
                                RelativePath="..\..\src\msw\textctrl.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2323,19 +3127,19 @@
                                RelativePath="..\..\src\msw\textentry.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2343,19 +3147,51 @@
                                RelativePath="..\..\src\msw\tglbtn.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2363,19 +3199,51 @@
                                RelativePath="..\..\src\msw\toolbar.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\msw_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\msw_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\msw_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2391,19 +3259,19 @@
                                RelativePath="..\..\src\msw\treectrl.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2423,19 +3291,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
@@ -2456,21 +3324,53 @@
                                RelativePath="..\..\src\generic\accel.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\generic_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\generic_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\generic_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\generic_accel.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\busyinfo.cpp"\r
@@ -2500,19 +3400,19 @@
                                RelativePath="..\..\src\generic\colrdlgg.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2532,19 +3432,19 @@
                                RelativePath="..\..\src\generic\dirdlgg.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2556,21 +3456,53 @@
                                RelativePath="..\..\src\generic\fdrepdlg.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\generic_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\generic_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\generic_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\generic_fdrepdlg.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\filectrlg.cpp"\r
@@ -2580,19 +3512,19 @@
                                RelativePath="..\..\src\generic\filedlgg.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2604,19 +3536,19 @@
                                RelativePath="..\..\src\generic\fontdlgg.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2624,6 +3556,10 @@
                                RelativePath="..\..\src\generic\fontpickerg.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\graphicc.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\headerctrlg.cpp"\r
                                >\r
@@ -2636,21 +3572,53 @@
                                RelativePath="..\..\src\generic\listctrl.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\generic_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\generic_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\generic_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\generic_listctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\logg.cpp"\r
@@ -2660,19 +3628,19 @@
                                RelativePath="..\..\src\generic\mdig.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2680,19 +3648,19 @@
                                RelativePath="..\..\src\generic\msgdlgg.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2752,19 +3720,51 @@
                                RelativePath="..\..\src\generic\statusbr.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\generic_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\core\generic_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\core\generic_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\core\generic_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2805,159 +3805,383 @@
                                RelativePath="..\..\src\univ\bmpbuttn.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_bmpbuttn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\button.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_button.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\checkbox.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_checkbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\checklst.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_checklst.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\choice.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_choice.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\combobox.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_combobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\control.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_control.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\ctrlrend.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -2965,39 +4189,71 @@
                                RelativePath="..\..\src\univ\dialog.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_dialog.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\framuniv.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -3005,39 +4261,71 @@
                                RelativePath="..\..\src\univ\gauge.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_gauge.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\themes\gtk.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -3045,19 +4333,19 @@
                                RelativePath="..\..\src\univ\inpcons.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -3065,19 +4353,19 @@
                                RelativePath="..\..\src\univ\inphand.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -3085,59 +4373,123 @@
                                RelativePath="..\..\src\univ\listbox.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_listbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\menu.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_menu.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\themes\metal.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -3145,19 +4497,19 @@
                                RelativePath="..\..\src\univ\themes\mono.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -3165,79 +4517,175 @@
                                RelativePath="..\..\src\univ\notebook.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_notebook.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\radiobox.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_radiobox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\radiobut.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_radiobut.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\scrarrow.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -3245,39 +4693,71 @@
                                RelativePath="..\..\src\univ\scrolbar.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_scrolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\scrthumb.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -3285,19 +4765,19 @@
                                RelativePath="..\..\src\univ\settingsuniv.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -3305,159 +4785,383 @@
                                RelativePath="..\..\src\univ\slider.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_slider.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\spinbutt.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_spinbutt.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\statbmp.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_statbmp.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\statbox.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_statbox.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\statline.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_statline.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\stattext.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_stattext.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\statusbr.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_statusbr.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\stdrend.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -3465,59 +5169,123 @@
                                RelativePath="..\..\src\univ\textctrl.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_textctrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\tglbtn.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_tglbtn.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\theme.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -3525,39 +5293,71 @@
                                RelativePath="..\..\src\univ\toolbar.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\core\univ_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\core\univ_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\core\univ_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\core\univ_toolbar.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\univ\topluniv.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -3565,19 +5365,19 @@
                                RelativePath="..\..\src\univ\themes\win32.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -3585,19 +5385,19 @@
                                RelativePath="..\..\src\univ\winuniv.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
@@ -3610,121 +5410,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
@@ -3835,10 +5635,6 @@
                                RelativePath="..\..\include\wx\msw\ole\dataobj2.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\datecontrols.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\datectrl.h"\r
                                >\r
@@ -3927,91 +5723,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
@@ -4316,6 +6112,14 @@
                                RelativePath="..\..\include\wx\generic\dragimgg.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\dvrenderer.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\dvrenderers.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\fdrepdlg.h"\r
                                >\r
@@ -4368,6 +6172,10 @@
                                RelativePath="..\..\include\wx\generic\hyperlink.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\infobar.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\laywin.h"\r
                                >\r
@@ -4759,6 +6567,10 @@
                                RelativePath="..\..\include\wx\bmpcbox.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\bookctrl.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\bookctrl.h"\r
                                >\r
@@ -4963,6 +6775,10 @@
                                RelativePath="..\..\include\wx\dragimag.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dvrenderers.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\editlbox.h"\r
                                >\r
@@ -4983,6 +6799,10 @@
                                RelativePath="..\..\include\wx\evtloop.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\evtloopsrc.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\fdrepdlg.h"\r
                                >\r
@@ -5159,6 +6979,10 @@
                                RelativePath="..\..\include\wx\imagxpm.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\infobar.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\joystick.h"\r
                                >\r
@@ -5219,6 +7043,10 @@
                                RelativePath="..\..\include\wx\minifram.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\mousemanager.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msgdlg.h"\r
                                >\r
@@ -5271,6 +7099,10 @@
                                RelativePath="..\..\include\wx\pen.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\pickerbase.h"\r
                                >\r
@@ -5495,6 +7327,10 @@
                                RelativePath="..\..\include\wx\textentry.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\textwrapper.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\tglbtn.h"\r
                                >\r
@@ -5523,6 +7359,10 @@
                                RelativePath="..\..\include\wx\toplevel.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\toplevel.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\treebase.h"\r
                                >\r
@@ -5531,6 +7371,10 @@
                                RelativePath="..\..\include\wx\treebook.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\treebook.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\treectrl.h"\r
                                >\r
@@ -5567,6 +7411,10 @@
                                RelativePath="..\..\include\wx\window.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\window.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\windowid.h"\r
                                >\r
@@ -5643,6 +7491,10 @@
                                RelativePath="..\..\include\wx\xrc\xh_combo.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_comboctrl.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_datectrl.h"\r
                                >\r
@@ -5655,6 +7507,14 @@
                                RelativePath="..\..\include\wx\xrc\xh_dlg.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_editlbox.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_filectrl.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_filepicker.h"\r
                                >\r