set "eol-style" and "keywords" properties

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

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index bf0480a76dab3993a7c216c8b4090d9f1f7393d9..0e98b018b34a2821d0e4388b351a0a20db3fbc44 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,7 +35,7 @@ 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
@@ -55,20 +47,20 @@ RSC=rc.exe
 # 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" /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" /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"\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"\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,70 +72,20 @@ 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 /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\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 /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\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
-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
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\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
+# 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 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
+# 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\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\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -155,20 +97,20 @@ LINK32=link.exe
 # 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" /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" /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"\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"\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,70 +122,20 @@ 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 /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\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 /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\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\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\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
-\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
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -255,8 +147,8 @@ LINK32=link.exe
 # 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 /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 /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 /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\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 /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\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,53 +181,7 @@ 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
-\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
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 0\r
@@ -347,8 +193,8 @@ LIB32=link.exe -lib
 # 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 /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 /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 /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\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 /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\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
@@ -602,6 +394,10 @@ SOURCE=..\..\src\common\fddlgcmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\filectrlcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\filepickercmn.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -818,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
@@ -856,15 +656,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
@@ -872,26 +664,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
@@ -900,12 +678,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
@@ -919,15 +691,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
@@ -935,26 +699,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
@@ -963,12 +713,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
@@ -994,15 +738,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
@@ -1010,26 +746,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
@@ -1038,12 +760,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
@@ -1061,15 +777,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
@@ -1077,26 +785,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
@@ -1105,12 +799,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
@@ -1128,15 +816,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
@@ -1144,26 +824,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
@@ -1172,12 +838,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
@@ -1191,15 +851,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
@@ -1207,26 +859,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
@@ -1235,12 +873,6 @@ SOURCE=..\..\src\msw\checklst.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
@@ -1254,15 +886,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
@@ -1270,26 +894,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
@@ -1298,12 +908,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
@@ -1321,15 +925,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
@@ -1337,26 +933,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
@@ -1365,12 +947,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
@@ -1388,15 +964,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
@@ -1404,26 +972,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
@@ -1432,12 +986,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
@@ -1451,15 +999,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
@@ -1467,26 +1007,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
@@ -1495,12 +1021,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
@@ -1514,15 +1034,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
@@ -1530,26 +1042,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
@@ -1558,12 +1056,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
@@ -1609,15 +1101,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
@@ -1625,26 +1109,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
@@ -1653,12 +1123,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
@@ -1680,15 +1144,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
@@ -1696,26 +1152,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
@@ -1724,12 +1166,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
@@ -1747,15 +1183,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
@@ -1763,26 +1191,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
@@ -1791,12 +1205,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
@@ -1826,15 +1234,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
@@ -1842,26 +1242,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
@@ -1870,12 +1256,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
@@ -1889,15 +1269,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
@@ -1905,26 +1277,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
@@ -1933,12 +1291,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
@@ -1956,15 +1308,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
@@ -1972,26 +1316,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
@@ -2000,12 +1330,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
@@ -2027,15 +1351,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
@@ -2043,26 +1359,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
@@ -2071,12 +1373,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
@@ -2090,15 +1386,7 @@ SOURCE=..\..\src\msw\frame.cpp
 \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
-\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
@@ -2106,40 +1394,20 @@ 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
+!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
@@ -2167,6 +1435,10 @@ 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
@@ -2185,15 +1457,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
@@ -2201,26 +1465,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
@@ -2229,12 +1479,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
@@ -2248,15 +1492,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
@@ -2264,26 +1500,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
@@ -2292,12 +1514,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
@@ -2311,15 +1527,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
@@ -2327,26 +1535,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
@@ -2355,12 +1549,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
@@ -2378,15 +1566,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
@@ -2394,26 +1574,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
@@ -2422,12 +1588,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
@@ -2441,15 +1601,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
@@ -2457,26 +1609,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
@@ -2485,12 +1623,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
@@ -2504,15 +1636,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
@@ -2520,26 +1644,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
@@ -2548,12 +1658,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
@@ -2567,15 +1671,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
@@ -2583,26 +1679,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
@@ -2611,12 +1693,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
@@ -2634,15 +1710,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
@@ -2650,26 +1718,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
@@ -2678,12 +1732,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
@@ -2701,15 +1749,7 @@ SOURCE=..\..\src\msw\mslu.cpp
 \r
 SOURCE=..\..\src\msw\nativdlg.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
@@ -2717,26 +1757,12 @@ SOURCE=..\..\src\msw\nativdlg.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
@@ -2745,12 +1771,6 @@ SOURCE=..\..\src\msw\nativdlg.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
@@ -2764,15 +1784,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
@@ -2780,26 +1792,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
@@ -2808,12 +1806,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
@@ -2831,15 +1823,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
@@ -2847,26 +1831,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
@@ -2875,12 +1845,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
@@ -2914,15 +1878,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
@@ -2930,26 +1886,12 @@ 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
-\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
@@ -2958,12 +1900,6 @@ SOURCE=..\..\src\msw\radiobox.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
@@ -2977,42 +1913,20 @@ SOURCE=..\..\src\msw\radiobox.cpp
 \r
 SOURCE=..\..\src\msw\radiobut.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
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
-\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
@@ -3021,12 +1935,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
@@ -3048,15 +1956,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
@@ -3064,26 +1964,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
@@ -3092,12 +1978,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
@@ -3115,15 +1995,7 @@ SOURCE=..\..\src\msw\settings.cpp
 \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
-\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
@@ -3131,26 +2003,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
@@ -3159,12 +2017,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
@@ -3178,15 +2030,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
@@ -3194,26 +2038,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
@@ -3222,12 +2052,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
@@ -3241,15 +2065,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
@@ -3257,26 +2073,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
@@ -3285,12 +2087,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
@@ -3304,15 +2100,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
@@ -3320,26 +2108,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
@@ -3348,12 +2122,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
@@ -3367,15 +2135,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
@@ -3383,26 +2143,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
@@ -3411,12 +2157,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
@@ -3430,15 +2170,7 @@ SOURCE=..\..\src\msw\statbox.cpp
 \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
-\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
@@ -3446,26 +2178,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
@@ -3474,12 +2192,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
@@ -3493,15 +2205,7 @@ SOURCE=..\..\src\msw\statbr95.cpp
 \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
-\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
@@ -3509,26 +2213,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
@@ -3537,12 +2227,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
@@ -3556,15 +2240,7 @@ SOURCE=..\..\src\msw\statline.cpp
 \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
-\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
@@ -3572,26 +2248,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
@@ -3600,12 +2262,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
@@ -3619,15 +2275,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
@@ -3635,26 +2283,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
@@ -3663,12 +2297,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
@@ -3682,15 +2310,7 @@ SOURCE=..\..\src\msw\tabctrl.cpp
 \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
-\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
@@ -3698,26 +2318,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
@@ -3726,12 +2332,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
@@ -3745,15 +2345,7 @@ SOURCE=..\..\src\msw\tbar95.cpp
 \r
 SOURCE=..\..\src\msw\textctrl.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
@@ -3761,41 +2353,21 @@ 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
+!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
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
@@ -3806,57 +2378,64 @@ SOURCE=..\..\src\msw\textctrl.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\tglbtn.cpp\r
+SOURCE=..\..\src\msw\textentry.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 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
+!ENDIF\r
+\r
+# End Source File\r
+# Begin Source File\r
 \r
+SOURCE=..\..\src\msw\tglbtn.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
@@ -3879,15 +2458,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
@@ -3895,26 +2466,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
@@ -3923,12 +2480,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
@@ -3954,38 +2505,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
@@ -3994,14 +2525,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
@@ -4029,26 +2552,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
@@ -4057,26 +2566,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
@@ -4116,26 +2611,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
@@ -4144,26 +2625,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
@@ -4191,26 +2658,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
@@ -4219,26 +2672,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
@@ -4258,26 +2697,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
@@ -4286,26 +2711,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
@@ -4319,28 +2730,18 @@ SOURCE=..\..\src\generic\fdrepdlg.cpp
 # End Source File\r
 # Begin Source File\r
 \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
+SOURCE=..\..\src\generic\filectrlg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
+SOURCE=..\..\src\generic\filedlgg.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
@@ -4349,26 +2750,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
@@ -4388,26 +2775,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
@@ -4416,26 +2789,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
@@ -4459,26 +2818,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
@@ -4487,26 +2832,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
@@ -4526,26 +2857,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
@@ -4554,26 +2871,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
@@ -4589,26 +2892,12 @@ 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
-\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
@@ -4617,26 +2906,12 @@ SOURCE=..\..\src\generic\msgdlgg.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
+!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
@@ -4696,15 +2971,7 @@ SOURCE=..\..\src\generic\srchctlg.cpp
 \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
-\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
@@ -4712,26 +2979,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
@@ -4740,12 +2993,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
@@ -4759,26 +3006,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
@@ -4787,26 +3020,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
@@ -4854,26 +3073,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
@@ -4882,26 +3087,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
@@ -4917,26 +3108,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
@@ -4945,26 +3122,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
@@ -4980,26 +3143,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
@@ -5008,26 +3157,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
@@ -5043,26 +3178,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
@@ -5071,26 +3192,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
@@ -5106,26 +3213,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
@@ -5134,26 +3227,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
@@ -5169,26 +3248,12 @@ SOURCE=..\..\src\univ\choice.cpp
 \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
-\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
@@ -5197,26 +3262,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
@@ -5232,26 +3283,12 @@ SOURCE=..\..\src\univ\colschem.cpp
 \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
-\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
@@ -5260,26 +3297,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
@@ -5295,26 +3318,12 @@ SOURCE=..\..\src\univ\combobox.cpp
 \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
-\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
@@ -5323,26 +3332,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
@@ -5358,26 +3353,12 @@ SOURCE=..\..\src\univ\control.cpp
 \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
-\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
@@ -5386,26 +3367,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
@@ -5421,26 +3388,12 @@ SOURCE=..\..\src\univ\ctrlrend.cpp
 \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
-\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
@@ -5449,26 +3402,12 @@ SOURCE=..\..\src\univ\dialog.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
@@ -5484,27 +3423,13 @@ SOURCE=..\..\src\univ\dialog.cpp
 \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
-\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
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -5512,26 +3437,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
@@ -5547,26 +3458,12 @@ SOURCE=..\..\src\univ\framuniv.cpp
 \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
-\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
@@ -5575,26 +3472,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
@@ -5610,26 +3493,12 @@ SOURCE=..\..\src\univ\gauge.cpp
 \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
-\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
@@ -5638,26 +3507,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
@@ -5673,26 +3528,12 @@ SOURCE=..\..\src\univ\themes\gtk.cpp
 \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
-\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
@@ -5701,26 +3542,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
@@ -5736,26 +3563,12 @@ SOURCE=..\..\src\univ\inpcons.cpp
 \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
-\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
@@ -5764,26 +3577,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
@@ -5799,26 +3598,12 @@ SOURCE=..\..\src\univ\inphand.cpp
 \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
-\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
@@ -5827,26 +3612,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
@@ -5862,26 +3633,12 @@ SOURCE=..\..\src\univ\listbox.cpp
 \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
-\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
@@ -5890,26 +3647,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
@@ -5925,26 +3668,12 @@ SOURCE=..\..\src\univ\menu.cpp
 \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
-\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
@@ -5953,26 +3682,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
@@ -5988,26 +3703,12 @@ SOURCE=..\..\src\univ\themes\metal.cpp
 \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
-\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
@@ -6016,26 +3717,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
@@ -6051,26 +3738,12 @@ SOURCE=..\..\src\univ\themes\mono.cpp
 \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
-\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
@@ -6079,26 +3752,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
@@ -6114,26 +3773,12 @@ SOURCE=..\..\src\univ\notebook.cpp
 \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
-\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
@@ -6142,26 +3787,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
@@ -6177,26 +3808,12 @@ SOURCE=..\..\src\univ\radiobox.cpp
 \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
-\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
@@ -6205,26 +3822,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
@@ -6240,26 +3843,12 @@ SOURCE=..\..\src\univ\radiobut.cpp
 \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
-\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
@@ -6268,26 +3857,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
@@ -6303,26 +3878,12 @@ SOURCE=..\..\src\univ\scrarrow.cpp
 \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
-\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
@@ -6331,26 +3892,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
@@ -6366,26 +3913,12 @@ SOURCE=..\..\src\univ\scrolbar.cpp
 \r
 SOURCE=..\..\src\univ\scrthumb.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
@@ -6394,26 +3927,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
@@ -6429,26 +3948,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
@@ -6457,26 +3962,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
@@ -6492,26 +3983,12 @@ 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
@@ -6520,26 +3997,12 @@ SOURCE=..\..\src\univ\spinbutt.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
@@ -6555,26 +4018,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
@@ -6583,26 +4032,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
@@ -6618,26 +4053,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
@@ -6646,26 +4067,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
@@ -6681,26 +4088,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
@@ -6709,26 +4102,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
@@ -6744,26 +4123,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
@@ -6772,26 +4137,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
@@ -6807,26 +4158,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
@@ -6835,26 +4172,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
@@ -6870,26 +4193,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
@@ -6898,26 +4207,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
@@ -6933,26 +4228,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
@@ -6961,26 +4242,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
@@ -6996,26 +4263,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
@@ -7024,26 +4277,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
@@ -7059,26 +4298,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
@@ -7087,26 +4312,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
@@ -7122,39 +4333,19 @@ 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
 \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
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
+# PROP Exclude_From_Build 1\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
@@ -7162,14 +4353,6 @@ SOURCE=..\..\src\univ\toolbar.cpp
 !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
@@ -7185,26 +4368,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
@@ -7213,26 +4382,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
@@ -7248,26 +4403,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
@@ -7276,26 +4417,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
@@ -7311,26 +4438,12 @@ SOURCE=..\..\src\univ\themes\win32.cpp
 \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
+!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
@@ -7339,26 +4452,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
@@ -7378,19 +4477,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
@@ -7402,7 +4489,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
@@ -7412,7 +4499,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
@@ -7422,38 +4509,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
@@ -7466,7 +4521,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
@@ -7476,7 +4531,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
@@ -7486,26 +4541,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
@@ -7513,7 +4548,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
@@ -7523,7 +4558,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
@@ -7533,38 +4568,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
@@ -7577,7 +4580,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
@@ -7587,7 +4590,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
@@ -7597,38 +4600,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
@@ -7832,7 +4803,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
@@ -7842,7 +4813,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
@@ -7852,27 +4823,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
@@ -7882,7 +4833,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
@@ -7892,27 +4843,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
@@ -7922,7 +4853,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
@@ -7932,27 +4863,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
@@ -7962,7 +4873,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
@@ -7972,26 +4883,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
@@ -8077,6 +4968,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
@@ -8177,6 +5072,10 @@ SOURCE=..\..\include\wx\msw\textctrl.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\msw\textentry.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\msw\tglbtn.h\r
 # End Source File\r
 # Begin Source File\r
@@ -8293,6 +5192,10 @@ SOURCE=..\..\include\wx\generic\fdrepdlg.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\generic\filectrlg.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\generic\filedlgg.h\r
 # End Source File\r
 # Begin Source File\r
@@ -8353,6 +5256,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
@@ -8817,10 +5724,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 +5832,10 @@ SOURCE=..\..\include\wx\fdrepdlg.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\filectrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\filedlg.h\r
 # End Source File\r
 # Begin Source File\r
@@ -9157,6 +6064,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
@@ -9393,6 +6304,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