inside <wx-data> we need to use instead of /

[wxWidgets.git] / build / msw / wx_core.dsp

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 8ae8d81c3fdcdbd1d1b8d485cdd10c9dcb269f0d..1fe9214bf9ecfd5e61aac022c055f19d0eabb39f 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -18,20 +18,12 @@ CFG=core - Win32 Debug
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "core - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "core - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "core - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "core - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "core - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "core - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "core - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "core - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "core - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "core - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "core - Win32 Universal Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "core - Win32 Universal Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "core - Win32 Unicode Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "core - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "core - Win32 Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "core - Win32 Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE \r
@@ -43,32 +35,32 @@ CFG=core - Win32 Debug
 CPP=cl.exe\r
 RSC=rc.exe\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Use_Debug_Libraries 1\r
 # PROP BASE Output_Dir "..\..\lib\vc_dll"\r
 # PROP BASE Intermediate_Dir "vc_mswunivudll\core"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\core"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 odbc32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
-# ADD LINK32 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 odbc32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
+# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"\r
+# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -80,95 +72,45 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivuddll\core"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 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 odbc32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug\r
-# ADD LINK32 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 odbc32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivdll\core"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswunivdll\core"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.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 odbc32.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_core.lib"\r
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.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 odbc32.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_core.lib"\r
+# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r
+# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
 # PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivddll\core"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswunivddll\core"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.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 odbc32.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_core.lib" /debug\r
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.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 odbc32.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_core.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
 # PROP BASE Intermediate_Dir "vc_mswudll\core"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\core"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 odbc32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib"\r
-# ADD LINK32 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 odbc32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib"\r
+# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"\r
+# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -180,83 +122,33 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\core"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 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 odbc32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug\r
-# ADD LINK32 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 odbc32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug\r
+# ADD BASE LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"\r
+# ADD LINK32 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 /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswdll\core"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswdll\core"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw290_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw290_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.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 odbc32.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_core.lib"\r
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.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 odbc32.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_core.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswddll\core"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswddll\core"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.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 odbc32.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_core.lib" /debug\r
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.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 odbc32.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_core.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
 # PROP BASE Output_Dir "..\..\lib\vc_lib"\r
 # PROP BASE Intermediate_Dir "vc_mswunivu\core"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswunivu\core"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -266,7 +158,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29u_core.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29u_core.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -278,8 +170,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswunivud\core"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -289,66 +181,20 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29ud_core.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29ud_core.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswuniv\core"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswuniv\core"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29_core.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29_core.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
 # PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswunivd\core"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswunivd\core"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29d_core.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29d_core.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
 # PROP BASE Intermediate_Dir "vc_mswu\core"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswu\core"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -358,7 +204,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29u_core.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29u_core.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -370,8 +216,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswud\core"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -381,70 +227,16 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29ud_core.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29ud_core.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_msw\core"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_msw\core"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29_core.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29_core.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswd\core"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswd\core"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29d_core.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29d_core.lib"\r
-\r
 !ENDIF\r
 \r
 # Begin Target\r
 \r
-# Name "core - Win32 DLL Universal Unicode Release"\r
-# Name "core - Win32 DLL Universal Unicode Debug"\r
 # Name "core - Win32 DLL Universal Release"\r
 # Name "core - Win32 DLL Universal Debug"\r
-# Name "core - Win32 DLL Unicode Release"\r
-# Name "core - Win32 DLL Unicode Debug"\r
 # Name "core - Win32 DLL Release"\r
 # Name "core - Win32 DLL Debug"\r
-# Name "core - Win32 Universal Unicode Release"\r
-# Name "core - Win32 Universal Unicode Debug"\r
 # Name "core - Win32 Universal Release"\r
 # Name "core - Win32 Universal Debug"\r
-# Name "core - Win32 Unicode Release"\r
-# Name "core - Win32 Unicode Debug"\r
 # Name "core - Win32 Release"\r
 # Name "core - Win32 Debug"\r
 # Begin Group "Common Sources"\r
@@ -822,6 +614,10 @@ SOURCE=..\..\src\common\textcmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\textentrycmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\toplvcmn.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -850,6 +646,14 @@ SOURCE=..\..\src\common\wincmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\windowid.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\common\wrapsizer.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\xpmdecod.cpp\r
 # End Source File\r
 # End Group\r
@@ -860,15 +664,7 @@ SOURCE=..\..\src\common\xpmdecod.cpp
 \r
 SOURCE=..\..\src\msw\accel.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -876,26 +672,12 @@ SOURCE=..\..\src\msw\accel.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -904,12 +686,6 @@ SOURCE=..\..\src\msw\accel.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -923,15 +699,7 @@ SOURCE=..\..\src\msw\accel.cpp
 \r
 SOURCE=..\..\src\msw\ole\access.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -939,26 +707,12 @@ SOURCE=..\..\src\msw\ole\access.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -967,12 +721,6 @@ SOURCE=..\..\src\msw\ole\access.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -998,15 +746,7 @@ SOURCE=..\..\src\msw\bitmap.cpp
 \r
 SOURCE=..\..\src\msw\bmpbuttn.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -1014,26 +754,12 @@ SOURCE=..\..\src\msw\bmpbuttn.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -1042,12 +768,6 @@ SOURCE=..\..\src\msw\bmpbuttn.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -1065,15 +785,7 @@ SOURCE=..\..\src\msw\brush.cpp
 \r
 SOURCE=..\..\src\msw\button.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -1081,26 +793,12 @@ SOURCE=..\..\src\msw\button.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -1109,12 +807,6 @@ SOURCE=..\..\src\msw\button.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -1132,15 +824,7 @@ SOURCE=..\..\src\msw\caret.cpp
 \r
 SOURCE=..\..\src\msw\checkbox.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -1148,26 +832,12 @@ SOURCE=..\..\src\msw\checkbox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -1176,12 +846,6 @@ SOURCE=..\..\src\msw\checkbox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -1195,15 +859,7 @@ SOURCE=..\..\src\msw\checkbox.cpp
 \r
 SOURCE=..\..\src\msw\checklst.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -1211,26 +867,12 @@ SOURCE=..\..\src\msw\checklst.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -1239,16 +881,10 @@ SOURCE=..\..\src\msw\checklst.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
 \r
 !ENDIF\r
@@ -1258,15 +894,7 @@ SOURCE=..\..\src\msw\checklst.cpp
 \r
 SOURCE=..\..\src\msw\choice.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -1274,26 +902,12 @@ SOURCE=..\..\src\msw\choice.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -1302,12 +916,6 @@ SOURCE=..\..\src\msw\choice.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -1325,15 +933,7 @@ SOURCE=..\..\src\msw\clipbrd.cpp
 \r
 SOURCE=..\..\src\msw\colordlg.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -1341,26 +941,12 @@ SOURCE=..\..\src\msw\colordlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -1369,12 +955,6 @@ SOURCE=..\..\src\msw\colordlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -1392,15 +972,7 @@ SOURCE=..\..\src\msw\colour.cpp
 \r
 SOURCE=..\..\src\msw\combo.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -1408,26 +980,12 @@ SOURCE=..\..\src\msw\combo.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -1436,12 +994,6 @@ SOURCE=..\..\src\msw\combo.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -1455,15 +1007,7 @@ SOURCE=..\..\src\msw\combo.cpp
 \r
 SOURCE=..\..\src\msw\combobox.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -1471,26 +1015,12 @@ SOURCE=..\..\src\msw\combobox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -1499,12 +1029,6 @@ SOURCE=..\..\src\msw\combobox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -1518,15 +1042,7 @@ SOURCE=..\..\src\msw\combobox.cpp
 \r
 SOURCE=..\..\src\msw\control.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -1534,26 +1050,12 @@ SOURCE=..\..\src\msw\control.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -1562,12 +1064,6 @@ SOURCE=..\..\src\msw\control.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -1613,15 +1109,7 @@ SOURCE=..\..\src\msw\dcscreen.cpp
 \r
 SOURCE=..\..\src\msw\dialog.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -1629,26 +1117,12 @@ SOURCE=..\..\src\msw\dialog.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -1657,12 +1131,6 @@ SOURCE=..\..\src\msw\dialog.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -1684,15 +1152,7 @@ SOURCE=..\..\src\msw\dib.cpp
 \r
 SOURCE=..\..\src\msw\dirdlg.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -1700,26 +1160,12 @@ SOURCE=..\..\src\msw\dirdlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -1728,12 +1174,6 @@ SOURCE=..\..\src\msw\dirdlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -1751,15 +1191,7 @@ SOURCE=..\..\src\msw\display.cpp
 \r
 SOURCE=..\..\src\msw\dragimag.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -1767,26 +1199,12 @@ SOURCE=..\..\src\msw\dragimag.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -1795,12 +1213,6 @@ SOURCE=..\..\src\msw\dragimag.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -1830,15 +1242,7 @@ SOURCE=..\..\src\msw\evtloop.cpp
 \r
 SOURCE=..\..\src\msw\fdrepdlg.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -1846,26 +1250,12 @@ SOURCE=..\..\src\msw\fdrepdlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -1874,12 +1264,6 @@ SOURCE=..\..\src\msw\fdrepdlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -1893,15 +1277,7 @@ SOURCE=..\..\src\msw\fdrepdlg.cpp
 \r
 SOURCE=..\..\src\msw\filedlg.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -1909,26 +1285,12 @@ SOURCE=..\..\src\msw\filedlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -1937,12 +1299,6 @@ SOURCE=..\..\src\msw\filedlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -1960,15 +1316,7 @@ SOURCE=..\..\src\msw\font.cpp
 \r
 SOURCE=..\..\src\msw\fontdlg.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -1976,26 +1324,12 @@ SOURCE=..\..\src\msw\fontdlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -2004,12 +1338,6 @@ SOURCE=..\..\src\msw\fontdlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -2031,15 +1359,7 @@ SOURCE=..\..\src\msw\fontutil.cpp
 \r
 SOURCE=..\..\src\msw\frame.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -2047,26 +1367,12 @@ SOURCE=..\..\src\msw\frame.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -2075,12 +1381,6 @@ SOURCE=..\..\src\msw\frame.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -2092,17 +1392,9 @@ SOURCE=..\..\src\msw\frame.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\gauge95.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
+SOURCE=..\..\src\msw\gauge.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -2110,27 +1402,13 @@ SOURCE=..\..\src\msw\gauge95.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -2138,12 +1416,6 @@ SOURCE=..\..\src\msw\gauge95.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -2171,10 +1443,6 @@ SOURCE=..\..\src\msw\graphics.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\gsockmsw.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\src\msw\helpchm.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -2193,15 +1461,7 @@ SOURCE=..\..\src\msw\imaglist.cpp
 \r
 SOURCE=..\..\src\msw\iniconf.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -2209,26 +1469,12 @@ SOURCE=..\..\src\msw\iniconf.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -2237,12 +1483,6 @@ SOURCE=..\..\src\msw\iniconf.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -2256,15 +1496,7 @@ SOURCE=..\..\src\msw\iniconf.cpp
 \r
 SOURCE=..\..\src\msw\listbox.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -2272,26 +1504,12 @@ SOURCE=..\..\src\msw\listbox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -2300,12 +1518,6 @@ SOURCE=..\..\src\msw\listbox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -2319,15 +1531,7 @@ SOURCE=..\..\src\msw\listbox.cpp
 \r
 SOURCE=..\..\src\msw\listctrl.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -2335,26 +1539,12 @@ SOURCE=..\..\src\msw\listctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -2363,12 +1553,6 @@ SOURCE=..\..\src\msw\listctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -2386,15 +1570,7 @@ SOURCE=..\..\src\msw\main.cpp
 \r
 SOURCE=..\..\src\msw\mdi.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -2402,26 +1578,12 @@ SOURCE=..\..\src\msw\mdi.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -2430,12 +1592,6 @@ SOURCE=..\..\src\msw\mdi.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -2449,15 +1605,7 @@ SOURCE=..\..\src\msw\mdi.cpp
 \r
 SOURCE=..\..\src\msw\menu.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -2465,26 +1613,12 @@ SOURCE=..\..\src\msw\menu.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -2493,12 +1627,6 @@ SOURCE=..\..\src\msw\menu.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -2512,15 +1640,7 @@ SOURCE=..\..\src\msw\menu.cpp
 \r
 SOURCE=..\..\src\msw\menuitem.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -2528,26 +1648,12 @@ SOURCE=..\..\src\msw\menuitem.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -2556,12 +1662,6 @@ SOURCE=..\..\src\msw\menuitem.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -2575,15 +1675,7 @@ SOURCE=..\..\src\msw\menuitem.cpp
 \r
 SOURCE=..\..\src\msw\metafile.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -2591,26 +1683,12 @@ SOURCE=..\..\src\msw\metafile.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -2619,12 +1697,6 @@ SOURCE=..\..\src\msw\metafile.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -2642,15 +1714,7 @@ SOURCE=..\..\src\msw\minifram.cpp
 \r
 SOURCE=..\..\src\msw\msgdlg.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -2658,26 +1722,12 @@ SOURCE=..\..\src\msw\msgdlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -2686,12 +1736,6 @@ SOURCE=..\..\src\msw\msgdlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -2709,55 +1753,62 @@ SOURCE=..\..\src\msw\mslu.cpp
 \r
 SOURCE=..\..\src\msw\nativdlg.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
+\r
 \r
-# PROP Exclude_From_Build 1\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
+\r
+# PROP Exclude_From_Build 1\r
 \r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
 \r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
+!ENDIF\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
+# End Source File\r
+# Begin Source File\r
 \r
+SOURCE=..\..\src\msw\nativewin.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
+# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
+# PROP Exclude_From_Build 1\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
@@ -2772,15 +1823,7 @@ SOURCE=..\..\src\msw\nativdlg.cpp
 \r
 SOURCE=..\..\src\msw\notebook.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -2788,26 +1831,12 @@ SOURCE=..\..\src\msw\notebook.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -2816,12 +1845,6 @@ SOURCE=..\..\src\msw\notebook.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -2839,15 +1862,7 @@ SOURCE=..\..\src\msw\ole\oleutils.cpp
 \r
 SOURCE=..\..\src\msw\ownerdrw.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -2855,26 +1870,12 @@ SOURCE=..\..\src\msw\ownerdrw.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -2883,12 +1884,6 @@ SOURCE=..\..\src\msw\ownerdrw.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -2922,15 +1917,7 @@ SOURCE=..\..\src\msw\printwin.cpp
 \r
 SOURCE=..\..\src\msw\radiobox.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -2938,40 +1925,20 @@ SOURCE=..\..\src\msw\radiobox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -2985,15 +1952,7 @@ SOURCE=..\..\src\msw\radiobox.cpp
 \r
 SOURCE=..\..\src\msw\radiobut.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -3001,26 +1960,12 @@ SOURCE=..\..\src\msw\radiobut.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -3029,12 +1974,6 @@ SOURCE=..\..\src\msw\radiobut.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -3056,15 +1995,7 @@ SOURCE=..\..\src\msw\renderer.cpp
 \r
 SOURCE=..\..\src\msw\scrolbar.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -3072,26 +2003,12 @@ SOURCE=..\..\src\msw\scrolbar.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -3100,12 +2017,6 @@ SOURCE=..\..\src\msw\scrolbar.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -3121,17 +2032,9 @@ SOURCE=..\..\src\msw\settings.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\slider95.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
+SOURCE=..\..\src\msw\slider.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -3139,26 +2042,12 @@ SOURCE=..\..\src\msw\slider95.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -3167,12 +2056,6 @@ SOURCE=..\..\src\msw\slider95.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -3186,15 +2069,7 @@ SOURCE=..\..\src\msw\slider95.cpp
 \r
 SOURCE=..\..\src\msw\spinbutt.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -3202,26 +2077,12 @@ SOURCE=..\..\src\msw\spinbutt.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -3230,12 +2091,6 @@ SOURCE=..\..\src\msw\spinbutt.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -3249,15 +2104,7 @@ SOURCE=..\..\src\msw\spinbutt.cpp
 \r
 SOURCE=..\..\src\msw\spinctrl.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -3265,26 +2112,12 @@ SOURCE=..\..\src\msw\spinctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -3293,12 +2126,6 @@ SOURCE=..\..\src\msw\spinctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -3312,15 +2139,7 @@ SOURCE=..\..\src\msw\spinctrl.cpp
 \r
 SOURCE=..\..\src\msw\statbmp.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -3328,26 +2147,12 @@ SOURCE=..\..\src\msw\statbmp.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -3356,12 +2161,6 @@ SOURCE=..\..\src\msw\statbmp.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -3375,15 +2174,7 @@ SOURCE=..\..\src\msw\statbmp.cpp
 \r
 SOURCE=..\..\src\msw\statbox.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -3391,26 +2182,12 @@ SOURCE=..\..\src\msw\statbox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -3419,12 +2196,6 @@ SOURCE=..\..\src\msw\statbox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -3436,17 +2207,9 @@ SOURCE=..\..\src\msw\statbox.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\statbr95.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
+SOURCE=..\..\src\msw\statline.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -3454,26 +2217,12 @@ SOURCE=..\..\src\msw\statbr95.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -3482,12 +2231,6 @@ SOURCE=..\..\src\msw\statbr95.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -3499,17 +2242,9 @@ SOURCE=..\..\src\msw\statbr95.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\statline.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
+SOURCE=..\..\src\msw\stattext.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -3517,26 +2252,12 @@ SOURCE=..\..\src\msw\statline.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -3545,12 +2266,6 @@ SOURCE=..\..\src\msw\statline.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -3562,17 +2277,9 @@ SOURCE=..\..\src\msw\statline.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\stattext.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
+SOURCE=..\..\src\msw\statusbar.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -3580,26 +2287,12 @@ SOURCE=..\..\src\msw\stattext.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -3608,12 +2301,6 @@ SOURCE=..\..\src\msw\stattext.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -3627,15 +2314,7 @@ SOURCE=..\..\src\msw\stattext.cpp
 \r
 SOURCE=..\..\src\msw\tabctrl.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -3643,26 +2322,12 @@ SOURCE=..\..\src\msw\tabctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -3671,12 +2336,6 @@ SOURCE=..\..\src\msw\tabctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -3688,17 +2347,9 @@ SOURCE=..\..\src\msw\tabctrl.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\tbar95.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
+SOURCE=..\..\src\msw\textctrl.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -3706,26 +2357,12 @@ SOURCE=..\..\src\msw\tbar95.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -3734,12 +2371,6 @@ SOURCE=..\..\src\msw\tbar95.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -3751,17 +2382,9 @@ SOURCE=..\..\src\msw\tbar95.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\textctrl.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
+SOURCE=..\..\src\msw\textentry.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -3769,26 +2392,12 @@ SOURCE=..\..\src\msw\textctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -3797,12 +2406,6 @@ SOURCE=..\..\src\msw\textctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -3816,55 +2419,62 @@ SOURCE=..\..\src\msw\textctrl.cpp
 \r
 SOURCE=..\..\src\msw\tglbtn.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
+\r
+# PROP Exclude_From_Build 1\r
 \r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
 \r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
+!ENDIF\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
+# End Source File\r
+# Begin Source File\r
 \r
+SOURCE=..\..\src\msw\toolbar.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
+# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
+# PROP Exclude_From_Build 1\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
@@ -3887,15 +2497,7 @@ SOURCE=..\..\src\msw\toplevel.cpp
 \r
 SOURCE=..\..\src\msw\treectrl.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -3903,26 +2505,12 @@ SOURCE=..\..\src\msw\treectrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -3931,12 +2519,6 @@ SOURCE=..\..\src\msw\treectrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -3962,38 +2544,18 @@ SOURCE=..\..\src\msw\uxtheme.cpp
 \r
 SOURCE=..\..\src\msw\version.rc\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4002,14 +2564,6 @@ SOURCE=..\..\src\msw\version.rc
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4037,26 +2591,12 @@ SOURCE=..\..\src\msw\window.cpp
 \r
 SOURCE=..\..\src\generic\accel.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4065,26 +2605,12 @@ SOURCE=..\..\src\generic\accel.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4124,26 +2650,12 @@ SOURCE=..\..\src\generic\collpaneg.cpp
 \r
 SOURCE=..\..\src\generic\colrdlgg.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4152,26 +2664,12 @@ SOURCE=..\..\src\generic\colrdlgg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4199,26 +2697,12 @@ SOURCE=..\..\src\generic\dirctrlg.cpp
 \r
 SOURCE=..\..\src\generic\dirdlgg.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4227,26 +2711,12 @@ SOURCE=..\..\src\generic\dirdlgg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4266,26 +2736,12 @@ SOURCE=..\..\src\generic\dragimgg.cpp
 \r
 SOURCE=..\..\src\generic\fdrepdlg.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4294,26 +2750,12 @@ SOURCE=..\..\src\generic\fdrepdlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4333,26 +2775,12 @@ SOURCE=..\..\src\generic\filectrlg.cpp
 \r
 SOURCE=..\..\src\generic\filedlgg.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4361,26 +2789,12 @@ SOURCE=..\..\src\generic\filedlgg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4400,26 +2814,12 @@ SOURCE=..\..\src\generic\filepickerg.cpp
 \r
 SOURCE=..\..\src\generic\fontdlgg.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4428,26 +2828,12 @@ SOURCE=..\..\src\generic\fontdlgg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4471,26 +2857,12 @@ SOURCE=..\..\src\generic\listbkg.cpp
 \r
 SOURCE=..\..\src\generic\listctrl.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4499,26 +2871,12 @@ SOURCE=..\..\src\generic\listctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4538,26 +2896,12 @@ SOURCE=..\..\src\generic\logg.cpp
 \r
 SOURCE=..\..\src\generic\mdig.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4566,26 +2910,12 @@ SOURCE=..\..\src\generic\mdig.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4601,54 +2931,26 @@ SOURCE=..\..\src\generic\mdig.cpp
 \r
 SOURCE=..\..\src\generic\msgdlgg.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4706,17 +3008,13 @@ SOURCE=..\..\src\generic\srchctlg.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\generic\statusbr.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
+SOURCE=..\..\src\generic\statbmpg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-# PROP Exclude_From_Build 1\r
+SOURCE=..\..\src\generic\statusbr.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -4724,26 +3022,12 @@ SOURCE=..\..\src\generic\statusbr.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4752,12 +3036,6 @@ SOURCE=..\..\src\generic\statusbr.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -4771,26 +3049,12 @@ SOURCE=..\..\src\generic\statusbr.cpp
 \r
 SOURCE=..\..\src\generic\tabg.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4799,26 +3063,12 @@ SOURCE=..\..\src\generic\tabg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4866,26 +3116,12 @@ SOURCE=..\..\src\generic\vscroll.cpp
 \r
 SOURCE=..\..\src\univ\bmpbuttn.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4894,26 +3130,12 @@ SOURCE=..\..\src\univ\bmpbuttn.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4929,26 +3151,12 @@ SOURCE=..\..\src\univ\bmpbuttn.cpp
 \r
 SOURCE=..\..\src\univ\button.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4957,26 +3165,12 @@ SOURCE=..\..\src\univ\button.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4992,26 +3186,12 @@ SOURCE=..\..\src\univ\button.cpp
 \r
 SOURCE=..\..\src\univ\checkbox.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5020,26 +3200,12 @@ SOURCE=..\..\src\univ\checkbox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5055,26 +3221,12 @@ SOURCE=..\..\src\univ\checkbox.cpp
 \r
 SOURCE=..\..\src\univ\checklst.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5083,26 +3235,12 @@ SOURCE=..\..\src\univ\checklst.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5118,26 +3256,12 @@ SOURCE=..\..\src\univ\checklst.cpp
 \r
 SOURCE=..\..\src\univ\choice.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5146,26 +3270,12 @@ SOURCE=..\..\src\univ\choice.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5179,28 +3289,14 @@ SOURCE=..\..\src\univ\choice.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\colschem.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\combobox.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5209,26 +3305,12 @@ SOURCE=..\..\src\univ\colschem.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5242,28 +3324,14 @@ SOURCE=..\..\src\univ\colschem.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\combobox.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\control.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5272,26 +3340,12 @@ SOURCE=..\..\src\univ\combobox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5305,28 +3359,14 @@ SOURCE=..\..\src\univ\combobox.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\control.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\ctrlrend.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5335,26 +3375,12 @@ SOURCE=..\..\src\univ\control.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5368,28 +3394,14 @@ SOURCE=..\..\src\univ\control.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\ctrlrend.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\dialog.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5398,26 +3410,12 @@ SOURCE=..\..\src\univ\ctrlrend.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5431,56 +3429,28 @@ SOURCE=..\..\src\univ\ctrlrend.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\dialog.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\framuniv.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5494,28 +3464,14 @@ SOURCE=..\..\src\univ\dialog.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\framuniv.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\gauge.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5524,26 +3480,12 @@ SOURCE=..\..\src\univ\framuniv.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5557,28 +3499,14 @@ SOURCE=..\..\src\univ\framuniv.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\gauge.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\themes\gtk.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5587,26 +3515,12 @@ SOURCE=..\..\src\univ\gauge.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5620,28 +3534,14 @@ SOURCE=..\..\src\univ\gauge.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\themes\gtk.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\inpcons.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5650,26 +3550,12 @@ SOURCE=..\..\src\univ\themes\gtk.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5683,28 +3569,14 @@ SOURCE=..\..\src\univ\themes\gtk.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\inpcons.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\inphand.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5713,26 +3585,12 @@ SOURCE=..\..\src\univ\inpcons.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5746,28 +3604,14 @@ SOURCE=..\..\src\univ\inpcons.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\inphand.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\listbox.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5776,26 +3620,12 @@ SOURCE=..\..\src\univ\inphand.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5809,28 +3639,14 @@ SOURCE=..\..\src\univ\inphand.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\listbox.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\menu.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5839,26 +3655,12 @@ SOURCE=..\..\src\univ\listbox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5872,28 +3674,14 @@ SOURCE=..\..\src\univ\listbox.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\menu.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\themes\metal.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5902,26 +3690,12 @@ SOURCE=..\..\src\univ\menu.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5935,28 +3709,14 @@ SOURCE=..\..\src\univ\menu.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\themes\metal.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\themes\mono.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5965,26 +3725,12 @@ SOURCE=..\..\src\univ\themes\metal.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5998,28 +3744,14 @@ SOURCE=..\..\src\univ\themes\metal.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\themes\mono.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\notebook.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6028,26 +3760,12 @@ SOURCE=..\..\src\univ\themes\mono.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6061,28 +3779,14 @@ SOURCE=..\..\src\univ\themes\mono.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\notebook.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\radiobox.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6091,26 +3795,12 @@ SOURCE=..\..\src\univ\notebook.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6124,28 +3814,14 @@ SOURCE=..\..\src\univ\notebook.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\radiobox.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\radiobut.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6154,26 +3830,12 @@ SOURCE=..\..\src\univ\radiobox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6187,28 +3849,14 @@ SOURCE=..\..\src\univ\radiobox.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\radiobut.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\scrarrow.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6217,26 +3865,12 @@ SOURCE=..\..\src\univ\radiobut.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6250,28 +3884,14 @@ SOURCE=..\..\src\univ\radiobut.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\scrarrow.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\scrolbar.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6280,26 +3900,12 @@ SOURCE=..\..\src\univ\scrarrow.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6313,28 +3919,14 @@ SOURCE=..\..\src\univ\scrarrow.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\scrolbar.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\scrthumb.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6343,26 +3935,12 @@ SOURCE=..\..\src\univ\scrolbar.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6376,28 +3954,14 @@ SOURCE=..\..\src\univ\scrolbar.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\scrthumb.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
+SOURCE=..\..\src\univ\settingsuniv.cpp\r
 \r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6406,26 +3970,12 @@ SOURCE=..\..\src\univ\scrthumb.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6441,26 +3991,12 @@ SOURCE=..\..\src\univ\scrthumb.cpp
 \r
 SOURCE=..\..\src\univ\slider.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6469,26 +4005,12 @@ SOURCE=..\..\src\univ\slider.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6504,53 +4026,25 @@ SOURCE=..\..\src\univ\slider.cpp
 \r
 SOURCE=..\..\src\univ\spinbutt.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
-\r
+# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
@@ -6567,26 +4061,12 @@ SOURCE=..\..\src\univ\spinbutt.cpp
 \r
 SOURCE=..\..\src\univ\statbmp.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6595,26 +4075,12 @@ SOURCE=..\..\src\univ\statbmp.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6630,26 +4096,12 @@ SOURCE=..\..\src\univ\statbmp.cpp
 \r
 SOURCE=..\..\src\univ\statbox.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6658,26 +4110,12 @@ SOURCE=..\..\src\univ\statbox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6693,26 +4131,12 @@ SOURCE=..\..\src\univ\statbox.cpp
 \r
 SOURCE=..\..\src\univ\statline.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6721,26 +4145,12 @@ SOURCE=..\..\src\univ\statline.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6756,26 +4166,12 @@ SOURCE=..\..\src\univ\statline.cpp
 \r
 SOURCE=..\..\src\univ\stattext.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6784,26 +4180,12 @@ SOURCE=..\..\src\univ\stattext.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6819,26 +4201,12 @@ SOURCE=..\..\src\univ\stattext.cpp
 \r
 SOURCE=..\..\src\univ\statusbr.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6847,26 +4215,12 @@ SOURCE=..\..\src\univ\statusbr.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6882,26 +4236,12 @@ SOURCE=..\..\src\univ\statusbr.cpp
 \r
 SOURCE=..\..\src\univ\stdrend.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6910,26 +4250,12 @@ SOURCE=..\..\src\univ\stdrend.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6945,26 +4271,12 @@ SOURCE=..\..\src\univ\stdrend.cpp
 \r
 SOURCE=..\..\src\univ\textctrl.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6973,26 +4285,12 @@ SOURCE=..\..\src\univ\textctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -7008,26 +4306,12 @@ SOURCE=..\..\src\univ\textctrl.cpp
 \r
 SOURCE=..\..\src\univ\tglbtn.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -7036,26 +4320,12 @@ SOURCE=..\..\src\univ\tglbtn.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -7071,26 +4341,12 @@ SOURCE=..\..\src\univ\tglbtn.cpp
 \r
 SOURCE=..\..\src\univ\theme.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -7099,26 +4355,12 @@ SOURCE=..\..\src\univ\theme.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -7134,26 +4376,12 @@ SOURCE=..\..\src\univ\theme.cpp
 \r
 SOURCE=..\..\src\univ\toolbar.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -7162,26 +4390,12 @@ SOURCE=..\..\src\univ\toolbar.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -7197,26 +4411,12 @@ SOURCE=..\..\src\univ\toolbar.cpp
 \r
 SOURCE=..\..\src\univ\topluniv.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -7225,26 +4425,12 @@ SOURCE=..\..\src\univ\topluniv.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -7260,26 +4446,12 @@ SOURCE=..\..\src\univ\topluniv.cpp
 \r
 SOURCE=..\..\src\univ\themes\win32.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -7288,26 +4460,12 @@ SOURCE=..\..\src\univ\themes\win32.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -7318,30 +4476,16 @@ SOURCE=..\..\src\univ\themes\win32.cpp
 \r
 !ENDIF\r
 \r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\univ\winuniv.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
+# End Source File\r
+# Begin Source File\r
 \r
+SOURCE=..\..\src\univ\winuniv.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
@@ -7351,26 +4495,12 @@ SOURCE=..\..\src\univ\winuniv.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -7390,19 +4520,7 @@ SOURCE=..\..\src\univ\winuniv.cpp
 \r
 SOURCE=..\..\include\wx\msw\setup.h\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # Begin Custom Build - \r
 \r
@@ -7414,7 +4532,7 @@ SOURCE=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h\r
 InputPath=..\..\include\wx\msw\setup.h\r
@@ -7424,7 +4542,7 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h\r
 InputPath=..\..\include\wx\msw\setup.h\r
@@ -7434,38 +4552,6 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # Begin Custom Build - \r
@@ -7478,7 +4564,7 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h\r
 InputPath=..\..\include\wx\msw\setup.h\r
@@ -7488,7 +4574,7 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h\r
 InputPath=..\..\include\wx\msw\setup.h\r
@@ -7498,26 +4584,6 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h\r
-InputPath=..\..\include\wx\msw\setup.h\r
-\r
-"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
 !ENDIF\r
 \r
 # End Source File\r
@@ -7525,7 +4591,7 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 SOURCE=..\..\include\wx\univ\setup.h\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h\r
 InputPath=..\..\include\wx\univ\setup.h\r
@@ -7535,7 +4601,7 @@ InputPath=..\..\include\wx\univ\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h\r
 InputPath=..\..\include\wx\univ\setup.h\r
@@ -7545,38 +4611,6 @@ InputPath=..\..\include\wx\univ\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # Begin Custom Build - \r
@@ -7589,7 +4623,7 @@ InputPath=..\..\include\wx\univ\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h\r
 InputPath=..\..\include\wx\univ\setup.h\r
@@ -7599,7 +4633,7 @@ InputPath=..\..\include\wx\univ\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h\r
 InputPath=..\..\include\wx\univ\setup.h\r
@@ -7609,38 +4643,6 @@ InputPath=..\..\include\wx\univ\setup.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h\r
-InputPath=..\..\include\wx\univ\setup.h\r
-\r
-"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# Begin Custom Build - \r
-\r
-# End Custom Build\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # Begin Custom Build - \r
@@ -7690,6 +4692,10 @@ SOURCE=..\..\include\wx\msw\bmpbuttn.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\msw\bmpcbox.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\msw\brush.h\r
 # End Source File\r
 # Begin Source File\r
@@ -7698,6 +4704,10 @@ SOURCE=..\..\include\wx\msw\button.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\msw\calctrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\msw\caret.h\r
 # End Source File\r
 # Begin Source File\r
@@ -7758,6 +4768,10 @@ SOURCE=..\..\include\wx\msw\ole\dataobj2.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\msw\datecontrols.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\msw\datectrl.h\r
 # End Source File\r
 # Begin Source File\r
@@ -7834,7 +4848,7 @@ SOURCE=..\..\include\wx\msw\frame.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\msw\gauge95.h\r
+SOURCE=..\..\include\wx\msw\gauge.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -7844,7 +4858,7 @@ SOURCE=..\..\include\wx\msw\gdiimage.h
 \r
 SOURCE=..\..\include\wx\msw\genrcdefs.h\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
@@ -7854,7 +4868,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
@@ -7864,27 +4878,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
@@ -7894,7 +4888,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
@@ -7904,27 +4898,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
@@ -7934,7 +4908,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
@@ -7944,27 +4918,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
@@ -7974,7 +4928,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
@@ -7984,26 +4938,6 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
 !ENDIF\r
 \r
 # End Source File\r
@@ -8089,6 +5023,10 @@ SOURCE=..\..\include\wx\msw\notebook.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\msw\notifmsg.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\msw\ole\oleutils.h\r
 # End Source File\r
 # Begin Source File\r
@@ -8137,7 +5075,7 @@ SOURCE=..\..\include\wx\msw\setup0.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\msw\slider95.h\r
+SOURCE=..\..\include\wx\msw\slider.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -8161,15 +5099,15 @@ SOURCE=..\..\include\wx\msw\statbox.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\msw\statbr95.h\r
+SOURCE=..\..\include\wx\msw\statline.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\msw\statline.h\r
+SOURCE=..\..\include\wx\msw\stattext.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\msw\stattext.h\r
+SOURCE=..\..\include\wx\msw\statusbar.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -8181,11 +5119,11 @@ SOURCE=..\..\include\wx\msw\taskbar.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\msw\tbar95.h\r
+SOURCE=..\..\include\wx\msw\textctrl.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\msw\textctrl.h\r
+SOURCE=..\..\include\wx\msw\textentry.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -8193,6 +5131,10 @@ SOURCE=..\..\include\wx\msw\tglbtn.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\msw\toolbar.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\msw\tooltip.h\r
 # End Source File\r
 # Begin Source File\r
@@ -8249,7 +5191,7 @@ SOURCE=..\..\include\wx\generic\buttonbar.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\generic\calctrl.h\r
+SOURCE=..\..\include\wx\generic\calctrlg.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -8369,6 +5311,10 @@ SOURCE=..\..\include\wx\generic\notebook.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\generic\notifmsg.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\generic\numdlgg.h\r
 # End Source File\r
 # Begin Source File\r
@@ -8417,6 +5363,10 @@ SOURCE=..\..\include\wx\generic\srchctlg.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\generic\statbmpg.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\generic\statusbr.h\r
 # End Source File\r
 # Begin Source File\r
@@ -8681,6 +5631,10 @@ SOURCE=..\..\include\wx\access.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\propgrid\advprops.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\anidecod.h\r
 # End Source File\r
 # Begin Source File\r
@@ -8701,6 +5655,10 @@ SOURCE=..\..\include\wx\aui\aui.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\aui\auibar.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\aui\auibook.h\r
 # End Source File\r
 # Begin Source File\r
@@ -8833,10 +5791,6 @@ SOURCE=..\..\include\wx\dateevt.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\dbgrid.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\include\wx\dc.h\r
 # End Source File\r
 # Begin Source File\r
@@ -8929,6 +5883,10 @@ SOURCE=..\..\include\wx\editlbox.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\propgrid\editors.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\effects.h\r
 # End Source File\r
 # Begin Source File\r
@@ -9137,6 +6095,10 @@ SOURCE=..\..\include\wx\listctrl.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\propgrid\manager.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\matrix.h\r
 # End Source File\r
 # Begin Source File\r
@@ -9169,6 +6131,10 @@ SOURCE=..\..\include\wx\msgdlg.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\nativewin.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\nonownedwnd.h\r
 # End Source File\r
 # Begin Source File\r
@@ -9177,6 +6143,10 @@ SOURCE=..\..\include\wx\notebook.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\notifmsg.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\numdlg.h\r
 # End Source File\r
 # Begin Source File\r
@@ -9241,7 +6211,27 @@ SOURCE=..\..\include\wx\propdlg.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\ptr_scpd.h\r
+SOURCE=..\..\include\wx\propgrid\property.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\propgrid\propgrid.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\propgrid\propgriddefs.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\propgrid\propgridiface.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\propgrid\propgridpagestate.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\propgrid\props.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -9413,6 +6403,10 @@ SOURCE=..\..\include\wx\textdlg.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\textentry.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\tglbtn.h\r
 # End Source File\r
 # Begin Source File\r
@@ -9425,6 +6419,10 @@ SOURCE=..\..\include\wx\tipwin.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\tls.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\toolbar.h\r
 # End Source File\r
 # Begin Source File\r
@@ -9485,10 +6483,18 @@ SOURCE=..\..\include\wx\window.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\windowid.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\wizard.h\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\wrapsizer.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\wupdlock.h\r
 # End Source File\r
 # Begin Source File\r