X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c7789014106c9269b0f4ecc1a3071b14f351d3f..2f55b88cb00cdf1e47a7b1745f056882b016f74f:/build/msw/wx_vc7_core.vcproj

diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 7f04f486ac..1240485c2b 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <!--
 
-  This makefile was generated by
-  Bakefile 0.2.5 (http://www.bakefile.org)
+  This project was generated by
+  Bakefile 0.2.8 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -17,27 +17,86 @@
 	</Platforms>
 	<Configurations>
 		<Configuration
-			Name="DLL Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivudll\core"
-			ConfigurationType="2"
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswud\core"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="3"
+				PrecompiledHeaderThrough="wx/wxprec.h"
+				PrecompiledHeaderFile="vc_mswud\wxprec_corelib.pch"
+				ObjectFile="vc_mswud\core\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_core.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswu\core"
+			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"
-				AssemblerListingLocation="vc_mswunivudll\core\"
-				ObjectFile="vc_mswunivudll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"
+				PrecompiledHeaderFile="vc_mswu\wxprec_corelib.pch"
+				ObjectFile="vc_mswu\core\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_core.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -45,19 +104,13 @@
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=""
-				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 ..\..\lib\vc_dll\wxbase29u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll"
-				LinkIncremental="2"
-				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"
-				TargetMachine="1"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -66,9 +119,9 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -81,18 +134,18 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="DLL Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivuddll\core"
-			ConfigurationType="2"
+			Name="Universal Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswunivud\core"
+			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
@@ -101,10 +154,9 @@
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"
-				AssemblerListingLocation="vc_mswunivuddll\core\"
-				ObjectFile="vc_mswunivuddll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"
+				PrecompiledHeaderFile="vc_mswunivud\wxprec_corelib.pch"
+				ObjectFile="vc_mswunivud\core\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_core.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -112,19 +164,13 @@
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=""
-				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 ..\..\lib\vc_dll\wxbase29ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll"
-				LinkIncremental="2"
-				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"
-				TargetMachine="1"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -133,9 +179,9 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -148,27 +194,26 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="DLL Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswudll\core"
-			ConfigurationType="2"
+			Name="Universal Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswunivu\core"
+			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"
-				AssemblerListingLocation="vc_mswudll\core\"
-				ObjectFile="vc_mswudll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"
+				PrecompiledHeaderFile="vc_mswunivu\wxprec_corelib.pch"
+				ObjectFile="vc_mswunivu\core\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_core.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -176,19 +221,13 @@
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=""
-				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 ..\..\lib\vc_dll\wxbase29u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll"
-				LinkIncremental="2"
-				ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\lib\vc_dll"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"
-				TargetMachine="1"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -197,9 +236,9 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -223,7 +262,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
@@ -233,9 +272,8 @@
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"
-				AssemblerListingLocation="vc_mswuddll\core\"
 				ObjectFile="vc_mswuddll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291ud_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -245,17 +283,19 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				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 ..\..\lib\vc_dll\wxbase29ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll"
+				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"
+				OutputFile="..\..\lib\vc_dll\wxmsw291ud_core_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291ud_core_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -264,7 +304,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
@@ -279,27 +319,26 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivu\core"
-			ConfigurationType="4"
+			Name="DLL Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswudll\core"
+			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswunivu\wxprec_corelib.pch"
-				AssemblerListingLocation="vc_mswunivu\core\"
-				ObjectFile="vc_mswunivu\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_core.pdb"
+				PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"
+				ObjectFile="vc_mswudll\core\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291u_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -307,11 +346,23 @@
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib"
-				SuppressStartupBanner="TRUE"/>
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				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"
+				OutputFile="..\..\lib\vc_dll\wxmsw291u_core_vc_custom.dll"
+				LinkIncremental="1"
+				ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\..\lib\vc_dll"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_core_vc_custom.pdb"
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -320,9 +371,9 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -335,18 +386,18 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivud\core"
-			ConfigurationType="4"
+			Name="DLL Universal Debug|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswunivuddll\core"
+			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
@@ -355,10 +406,9 @@
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswunivud\wxprec_corelib.pch"
-				AssemblerListingLocation="vc_mswunivud\core\"
-				ObjectFile="vc_mswunivud\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_core.pdb"
+				PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"
+				ObjectFile="vc_mswunivuddll\core\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291ud_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -366,11 +416,21 @@
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"
-				SuppressStartupBanner="TRUE"/>
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				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"
+				OutputFile="..\..\lib\vc_dll\wxmswuniv291ud_core_vc_custom.dll"
+				LinkIncremental="2"
+				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\..\lib\vc_dll"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291ud_core_vc_custom.pdb"
+				TargetMachine="1"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -379,9 +439,9 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -394,27 +454,26 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswu\core"
-			ConfigurationType="4"
+			Name="DLL Universal Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswunivudll\core"
+			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="1">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="3"
 				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswu\wxprec_corelib.pch"
-				AssemblerListingLocation="vc_mswu\core\"
-				ObjectFile="vc_mswu\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_core.pdb"
+				PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"
+				ObjectFile="vc_mswunivudll\core\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -422,11 +481,23 @@
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"
-				SuppressStartupBanner="TRUE"/>
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				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"
+				OutputFile="..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.dll"
+				LinkIncremental="1"
+				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\..\lib\vc_dll"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.pdb"
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -435,68 +506,9 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswud\core"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="1">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="3"
-				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="vc_mswud\wxprec_corelib.pch"
-				AssemblerListingLocation="vc_mswud\core\"
-				ObjectFile="vc_mswud\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_core.pdb"
-				WarningLevel="4"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -618,49 +630,49 @@
 			<File
 				RelativePath="..\..\src\common\dummy.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32">
+					Name="Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32">
+					Name="Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32">
+					Name="Universal Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32">
+					Name="Universal Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32">
+					Name="DLL Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32">
+					Name="DLL Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="DLL Universal Debug|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="DLL Universal Release|Win32">
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"/>
@@ -789,6 +801,9 @@
 			<File
 				RelativePath="..\..\src\common\menucmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\mousemanager.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\msgout.cpp">
 			</File>
@@ -798,9 +813,15 @@
 			<File
 				RelativePath="..\..\src\common\overlaycmn.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\ownerdrwcmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\paper.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\persist.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\pickerbase.cpp">
 			</File>
@@ -831,9 +852,6 @@
 			<File
 				RelativePath="..\..\src\common\sizer.cpp">
 			</File>
-			<File
-				RelativePath="..\..\src\common\spinbuttcmn.cpp">
-			</File>
 			<File
 				RelativePath="..\..\src\common\spinctrlcmn.cpp">
 			</File>
@@ -864,6 +882,9 @@
 			<File
 				RelativePath="..\..\src\common\treebase.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\uiactioncmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\utilscmn.cpp">
 			</File>
@@ -895,49 +916,76 @@
 			<File
 				RelativePath="..\..\src\msw\accel.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_accel.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_accel.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_accel.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_accel.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\ole\access.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
+			<File
+				RelativePath="..\..\src\msw\ole\activex.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\msw\app.cpp">
 			</File>
 			<File
 				RelativePath="..\..\src\msw\artmsw.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -949,16 +997,40 @@
 			<File
 				RelativePath="..\..\src\msw\bmpbuttn.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_bmpbuttn.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_bmpbuttn.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_bmpbuttn.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_bmpbuttn.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -967,16 +1039,40 @@
 			<File
 				RelativePath="..\..\src\msw\button.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_button.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_button.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_button.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_button.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -985,46 +1081,118 @@
 			<File
 				RelativePath="..\..\src\msw\checkbox.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_checkbox.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_checkbox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_checkbox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_checkbox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\checklst.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_checklst.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_checklst.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_checklst.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_checklst.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\choice.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_choice.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_choice.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_choice.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_choice.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1033,16 +1201,16 @@
 			<File
 				RelativePath="..\..\src\msw\colordlg.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1051,46 +1219,94 @@
 			<File
 				RelativePath="..\..\src\msw\combo.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\combobox.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_combobox.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_combobox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_combobox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_combobox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\control.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_control.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_control.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_control.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_control.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1120,16 +1336,40 @@
 			<File
 				RelativePath="..\..\src\msw\dialog.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_dialog.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_dialog.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_dialog.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_dialog.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1141,16 +1381,16 @@
 			<File
 				RelativePath="..\..\src\msw\dirdlg.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1159,16 +1399,16 @@
 			<File
 				RelativePath="..\..\src\msw\dragimag.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1186,31 +1426,55 @@
 			<File
 				RelativePath="..\..\src\msw\fdrepdlg.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_fdrepdlg.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_fdrepdlg.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_fdrepdlg.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_fdrepdlg.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\filedlg.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1219,16 +1483,16 @@
 			<File
 				RelativePath="..\..\src\msw\fontdlg.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1240,31 +1504,55 @@
 			<File
 				RelativePath="..\..\src\msw\frame.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\gauge.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_gauge.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_gauge.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_gauge.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_gauge.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1282,16 +1570,16 @@
 			<File
 				RelativePath="..\..\src\msw\headerctrl.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1309,46 +1597,94 @@
 			<File
 				RelativePath="..\..\src\msw\iniconf.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\listbox.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_listbox.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_listbox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_listbox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_listbox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\listctrl.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_listctrl.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_listctrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_listctrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_listctrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1357,61 +1693,85 @@
 			<File
 				RelativePath="..\..\src\msw\mdi.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\menu.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_menu.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_menu.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_menu.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_menu.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\menuitem.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\metafile.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1420,16 +1780,16 @@
 			<File
 				RelativePath="..\..\src\msw\msgdlg.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1438,46 +1798,70 @@
 			<File
 				RelativePath="..\..\src\msw\nativdlg.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\nativewin.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\notebook.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_notebook.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_notebook.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_notebook.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_notebook.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1486,16 +1870,16 @@
 			<File
 				RelativePath="..\..\src\msw\ownerdrw.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1516,31 +1900,79 @@
 			<File
 				RelativePath="..\..\src\msw\radiobox.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_radiobox.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_radiobox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_radiobox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_radiobox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\radiobut.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_radiobut.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_radiobut.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_radiobut.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_radiobut.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1552,16 +1984,40 @@
 			<File
 				RelativePath="..\..\src\msw\scrolbar.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_scrolbar.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_scrolbar.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_scrolbar.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_scrolbar.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1570,181 +2026,397 @@
 			<File
 				RelativePath="..\..\src\msw\slider.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_slider.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_slider.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_slider.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_slider.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\spinbutt.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_spinbutt.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_spinbutt.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_spinbutt.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_spinbutt.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\spinctrl.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\statbmp.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_statbmp.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_statbmp.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_statbmp.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_statbmp.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\statbox.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_statbox.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_statbox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_statbox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_statbox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\statline.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_statline.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_statline.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_statline.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_statline.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\stattext.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_stattext.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_stattext.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_stattext.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_stattext.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\statusbar.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\textctrl.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_textctrl.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_textctrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_textctrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_textctrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\textentry.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\tglbtn.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_tglbtn.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_tglbtn.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_tglbtn.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_tglbtn.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\toolbar.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_toolbar.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\msw_toolbar.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\msw_toolbar.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\msw_toolbar.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1756,17 +2428,32 @@
 			<File
 				RelativePath="..\..\src\msw\treectrl.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\uiaction.cpp">
 				<FileConfiguration
 					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\msw\utilsgui.cpp">
@@ -1780,16 +2467,16 @@
 			<File
 				RelativePath="..\..\src\msw\version.rc">
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1805,19 +2492,43 @@
 			<File
 				RelativePath="..\..\src\generic\accel.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\generic_accel.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\generic_accel.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\generic_accel.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\generic_accel.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\..\src\generic\busyinfo.cpp">
 			</File>
 			<File
@@ -1838,16 +2549,16 @@
 			<File
 				RelativePath="..\..\src\generic\colrdlgg.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1862,16 +2573,16 @@
 			<File
 				RelativePath="..\..\src\generic\dirdlgg.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1880,17 +2591,41 @@
 			<File
 				RelativePath="..\..\src\generic\fdrepdlg.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\generic_fdrepdlg.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\generic_fdrepdlg.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\generic_fdrepdlg.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\generic_fdrepdlg.obj"/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\filectrlg.cpp">
@@ -1898,16 +2633,16 @@
 			<File
 				RelativePath="..\..\src\generic\filedlgg.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -1916,21 +2651,24 @@
 			<File
 				RelativePath="..\..\src\generic\fontdlgg.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\fontpickerg.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\generic\graphicc.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\generic\headerctrlg.cpp">
 			</File>
@@ -1940,17 +2678,41 @@
 			<File
 				RelativePath="..\..\src\generic\listctrl.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\generic_listctrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\generic_listctrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\generic_listctrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\generic_listctrl.obj"/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\logg.cpp">
@@ -1958,31 +2720,31 @@
 			<File
 				RelativePath="..\..\src\generic\mdig.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\msgdlgg.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -2027,16 +2789,40 @@
 			<File
 				RelativePath="..\..\src\generic\statusbr.cpp">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\generic_statusbr.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\core\generic_statusbr.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\core\generic_statusbr.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\core\generic_statusbr.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
@@ -2067,601 +2853,1201 @@
 			<File
 				RelativePath="..\..\src\univ\bmpbuttn.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\button.cpp">
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_bmpbuttn.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_bmpbuttn.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_bmpbuttn.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_bmpbuttn.obj"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\checkbox.cpp">
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+				RelativePath="..\..\src\univ\button.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\checklst.cpp">
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_button.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_button.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_button.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_button.obj"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\choice.cpp">
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+				RelativePath="..\..\src\univ\checkbox.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\combobox.cpp">
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_checkbox.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_checkbox.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_checkbox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_checkbox.obj"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\control.cpp">
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+				RelativePath="..\..\src\univ\checklst.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\ctrlrend.cpp">
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_checklst.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_checklst.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_checklst.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_checklst.obj"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\dialog.cpp">
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+				RelativePath="..\..\src\univ\choice.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\framuniv.cpp">
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_choice.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_choice.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_choice.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_choice.obj"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\gauge.cpp">
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+				RelativePath="..\..\src\univ\combobox.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\themes\gtk.cpp">
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_combobox.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_combobox.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_combobox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_combobox.obj"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\inpcons.cpp">
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+				RelativePath="..\..\src\univ\control.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\inphand.cpp">
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_control.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_control.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_control.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_control.obj"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\listbox.cpp">
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+				RelativePath="..\..\src\univ\ctrlrend.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\menu.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\dialog.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\themes\metal.cpp">
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_dialog.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_dialog.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_dialog.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_dialog.obj"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\themes\mono.cpp">
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+				RelativePath="..\..\src\univ\framuniv.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\notebook.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\gauge.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\radiobox.cpp">
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_gauge.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_gauge.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_gauge.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_gauge.obj"/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\radiobut.cpp">
+				RelativePath="..\..\src\univ\themes\gtk.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\scrarrow.cpp">
+				RelativePath="..\..\src\univ\inpcons.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\scrolbar.cpp">
+				RelativePath="..\..\src\univ\inphand.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\univ\scrthumb.cpp">
+				RelativePath="..\..\src\univ\listbox.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_listbox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_listbox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\settingsuniv.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_listbox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_listbox.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\menu.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_menu.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_menu.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\slider.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_menu.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_menu.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\themes\metal.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\spinbutt.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\themes\mono.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\statbmp.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\notebook.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_notebook.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_notebook.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\statbox.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_notebook.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_notebook.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\radiobox.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_radiobox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_radiobox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\statline.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_radiobox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_radiobox.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\radiobut.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_radiobut.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_radiobut.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\stattext.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_radiobut.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_radiobut.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\scrarrow.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\statusbr.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\scrolbar.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_scrolbar.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_scrolbar.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\stdrend.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_scrolbar.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_scrolbar.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\scrthumb.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\textctrl.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\settingsuniv.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\tglbtn.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\slider.cpp">
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_slider.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_slider.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\univ\theme.cpp">
 				<FileConfiguration
 					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_slider.obj"/>
+				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_slider.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\spinbutt.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_spinbutt.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_spinbutt.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_spinbutt.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_spinbutt.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\statbmp.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_statbmp.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_statbmp.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_statbmp.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_statbmp.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\statbox.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_statbox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_statbox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_statbox.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_statbox.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\statline.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_statline.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_statline.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_statline.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_statline.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\stattext.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_stattext.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_stattext.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_stattext.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_stattext.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\statusbr.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_statusbr.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_statusbr.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_statusbr.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_statusbr.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\stdrend.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\textctrl.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_textctrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_textctrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_textctrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_textctrl.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\tglbtn.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_tglbtn.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_tglbtn.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_tglbtn.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_tglbtn.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\univ\theme.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\toolbar.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\core\univ_toolbar.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\core\univ_toolbar.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\core\univ_toolbar.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\core\univ_toolbar.obj"/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\topluniv.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\themes\win32.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
 				RelativePath="..\..\src\univ\winuniv.cpp">
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="DLL Debug|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="DLL Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
 		</Filter>
@@ -2671,96 +4057,96 @@
 			<File
 				RelativePath="..\..\include\wx\msw\setup.h">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"/>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"/>
-				<FileConfiguration
-					Name="DLL Release|Win32">
+					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"
+						Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"
+						Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"
 						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32">
+					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"
+						Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"
+						Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"
 						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Release|Win32"/>
 				<FileConfiguration
 					Name="Universal Debug|Win32"/>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Universal Release|Win32"/>
+				<FileConfiguration
+					Name="DLL Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"
+						Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"
+						Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"
 						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="DLL Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"
+						Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"
+						Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"
 						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"/>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\univ\setup.h">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32">
+					Name="Debug|Win32"/>
+				<FileConfiguration
+					Name="Release|Win32"/>
+				<FileConfiguration
+					Name="Universal Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"
+						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"
+						Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"
 						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32">
+					Name="Universal Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"
+						Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"
+						Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"
 						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32"/>
 				<FileConfiguration
 					Name="DLL Debug|Win32"/>
 				<FileConfiguration
-					Name="Universal Release|Win32">
+					Name="DLL Release|Win32"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"
+						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"
+						Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"
 						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32">
+					Name="DLL Universal Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"
+						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"
+						Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"
 						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"/>
-				<FileConfiguration
-					Name="Debug|Win32"/>
 			</File>
 		</Filter>
 		<Filter
@@ -2844,9 +4230,6 @@
 			<File
 				RelativePath="..\..\include\wx\msw\ole\dataobj2.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\datecontrols.h">
-			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\datectrl.h">
 			</File>
@@ -2913,40 +4296,31 @@
 			<File
 				RelativePath="..\..\include\wx\msw\genrcdefs.h">
 				<FileConfiguration
-					Name="DLL Universal Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32">
+					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"/>
+						Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32">
+					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"/>
+						Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32">
+					Name="Universal Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"/>
+						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Universal Release|Win32">
@@ -2958,31 +4332,40 @@
 						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32">
+					Name="DLL Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"/>
+						Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="DLL Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"/>
+						Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="DLL Universal Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>
+						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"
+						Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"/>
 				</FileConfiguration>
 			</File>
 			<File
@@ -3054,6 +4437,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\ole\oleutils.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\ownerdrw.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\palette.h">
 			</File>
@@ -3211,6 +4597,12 @@
 			<File
 				RelativePath="..\..\include\wx\generic\dragimgg.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\dvrenderer.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\dvrenderers.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\fdrepdlg.h">
 			</File>
@@ -3250,6 +4642,9 @@
 			<File
 				RelativePath="..\..\include\wx\generic\hyperlink.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\infobar.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\laywin.h">
 			</File>
@@ -3544,6 +4939,9 @@
 			<File
 				RelativePath="..\..\include\wx\bmpcbox.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\bookctrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\bookctrl.h">
 			</File>
@@ -3697,6 +5095,9 @@
 			<File
 				RelativePath="..\..\include\wx\dragimag.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\dvrenderers.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\editlbox.h">
 			</File>
@@ -3710,7 +5111,7 @@
 				RelativePath="..\..\include\wx\encinfo.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\evtloop.h">
+				RelativePath="..\..\include\wx\evtloopsrc.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\fdrepdlg.h">
@@ -3844,6 +5245,9 @@
 			<File
 				RelativePath="..\..\include\wx\imagxpm.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\infobar.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\joystick.h">
 			</File>
@@ -3889,6 +5293,9 @@
 			<File
 				RelativePath="..\..\include\wx\minifram.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\mousemanager.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msgdlg.h">
 			</File>
@@ -3928,6 +5335,9 @@
 			<File
 				RelativePath="..\..\include\wx\pen.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\pickerbase.h">
 			</File>
@@ -4096,6 +5506,9 @@
 			<File
 				RelativePath="..\..\include\wx\textentry.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\textwrapper.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\tglbtn.h">
 			</File>
@@ -4117,15 +5530,24 @@
 			<File
 				RelativePath="..\..\include\wx\toplevel.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\toplevel.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\treebase.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\treebook.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\treebook.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\treectrl.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\uiaction.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\valgen.h">
 			</File>
@@ -4150,6 +5572,9 @@
 			<File
 				RelativePath="..\..\include\wx\window.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\persist\window.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\windowid.h">
 			</File>
@@ -4207,6 +5632,9 @@
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_combo.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_comboctrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_datectrl.h">
 			</File>
@@ -4216,6 +5644,12 @@
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_dlg.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_editlbox.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_filectrl.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_filepicker.h">
 			</File>