fix assert failure if NULL size pointer was passed to Request() (as happened in the...

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

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 62b4ab5aa74e46a7ae8dfdb40e51474133ed32c5..1cdf8b9d3165653a3084da17821fb3fdc614a5cf 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,20 +35,20 @@ CFG=core - Win32 Debug
 CPP=cl.exe\r
 RSC=rc.exe\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Use_Debug_Libraries 1\r
 # PROP BASE Output_Dir "..\..\lib\vc_dll"\r
 # PROP BASE Intermediate_Dir "vc_mswunivudll\core"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\core"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb /I "..\..\src\tiff\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 CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_core_vc_custom /i "..\..\src\tiff\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
@@ -65,10 +57,10 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"\r
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -80,8 +72,8 @@ 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\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 CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_core_vc_custom /i "..\..\src\tiff\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
@@ -90,73 +82,23 @@ BSC32=bscmake.exe
 # 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\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 "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\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 "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\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__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_core.lib"\r
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_core.lib"\r
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
 # PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivddll\core"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswunivddll\core"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290d_core_vc_custom.pdb /I "..\..\src\tiff\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 "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\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 "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\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__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290d_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
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
 # PROP BASE Intermediate_Dir "vc_mswudll\core"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\core"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb /I "..\..\src\tiff\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 CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_core_vc_custom /i "..\..\src\tiff\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
@@ -165,10 +107,10 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib"\r
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib"\r
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"\r
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -180,8 +122,8 @@ 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\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 CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_core_vc_custom /i "..\..\src\tiff\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
@@ -190,73 +132,23 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug\r
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug\r
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"\r
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswdll\core"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswdll\core"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw290_core_vc_custom.pdb /I "..\..\src\tiff\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 "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\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 "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\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__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_core.lib"\r
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_core.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswddll\core"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswddll\core"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290d_core_vc_custom.pdb /I "..\..\src\tiff\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 "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\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 "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\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__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290d_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\wxmsw290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_core.lib" /debug\r
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_core.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
 # PROP BASE Output_Dir "..\..\lib\vc_lib"\r
 # PROP BASE Intermediate_Dir "vc_mswunivu\core"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswunivu\core"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff\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 CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -266,7 +158,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29u_core.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29u_core.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -278,8 +170,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswunivud\core"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff\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 CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -289,66 +181,20 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29ud_core.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29ud_core.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswuniv\core"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswuniv\core"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff\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 "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\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 "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29_core.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29_core.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
 # PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswunivd\core"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswunivd\core"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff\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 "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\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 "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29d_core.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29d_core.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
 # PROP BASE Intermediate_Dir "vc_mswu\core"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswu\core"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff\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 CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -358,7 +204,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29u_core.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29u_core.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -370,8 +216,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswud\core"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff\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 CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -381,70 +227,16 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29ud_core.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29ud_core.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_msw\core"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_msw\core"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /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\libtiff" /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\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 "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\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 "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
@@ -854,6 +646,14 @@ SOURCE=..\..\src\common\wincmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\windowid.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\common\wrapsizer.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\xpmdecod.cpp\r
 # End Source File\r
 # End Group\r
@@ -864,15 +664,7 @@ SOURCE=..\..\src\common\xpmdecod.cpp
 \r
 SOURCE=..\..\src\msw\accel.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -880,26 +672,12 @@ SOURCE=..\..\src\msw\accel.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -908,12 +686,6 @@ SOURCE=..\..\src\msw\accel.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -927,55 +699,66 @@ SOURCE=..\..\src\msw\accel.cpp
 \r
 SOURCE=..\..\src\msw\ole\access.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
+\r
+\r
+!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 Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
+!ENDIF\r
 \r
+# End Source File\r
+# Begin Source File\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
+SOURCE=..\..\src\msw\app.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
+SOURCE=..\..\src\msw\artmsw.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
@@ -988,10 +771,6 @@ SOURCE=..\..\src\msw\ole\access.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\app.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\src\msw\ole\automtn.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -1002,15 +781,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
@@ -1018,26 +789,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
@@ -1046,12 +803,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
@@ -1069,15 +820,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
@@ -1085,26 +828,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
@@ -1113,12 +842,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
@@ -1136,15 +859,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
@@ -1152,26 +867,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
@@ -1180,12 +881,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
@@ -1199,43 +894,21 @@ SOURCE=..\..\src\msw\checkbox.cpp
 \r
 SOURCE=..\..\src\msw\checklst.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
-# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -1243,12 +916,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
@@ -1262,15 +929,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
@@ -1278,26 +937,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
@@ -1306,12 +951,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
@@ -1329,15 +968,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
@@ -1345,26 +976,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
@@ -1373,12 +990,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
@@ -1396,15 +1007,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
@@ -1412,26 +1015,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
@@ -1440,12 +1029,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
@@ -1459,15 +1042,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
@@ -1475,26 +1050,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
@@ -1503,12 +1064,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
@@ -1522,15 +1077,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
@@ -1538,26 +1085,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
@@ -1566,12 +1099,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
@@ -1617,15 +1144,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
@@ -1633,26 +1152,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
@@ -1661,12 +1166,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
@@ -1688,15 +1187,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
@@ -1704,26 +1195,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
@@ -1732,12 +1209,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
@@ -1755,15 +1226,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
@@ -1771,26 +1234,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
@@ -1799,12 +1248,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
@@ -1834,15 +1277,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
@@ -1850,26 +1285,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
@@ -1878,12 +1299,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
@@ -1897,15 +1312,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
@@ -1913,26 +1320,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
@@ -1941,12 +1334,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
@@ -1964,15 +1351,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
@@ -1980,26 +1359,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
@@ -2008,12 +1373,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
@@ -2035,15 +1394,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
@@ -2051,41 +1402,21 @@ 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
+!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
@@ -2096,17 +1427,9 @@ SOURCE=..\..\src\msw\frame.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\gauge95.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
+SOURCE=..\..\src\msw\gauge.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -2114,26 +1437,12 @@ SOURCE=..\..\src\msw\gauge95.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -2142,12 +1451,6 @@ SOURCE=..\..\src\msw\gauge95.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -2175,10 +1478,6 @@ SOURCE=..\..\src\msw\graphics.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\gsockmsw.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\src\msw\helpchm.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -2197,15 +1496,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
@@ -2213,26 +1504,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
@@ -2241,12 +1518,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
@@ -2260,15 +1531,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
@@ -2276,26 +1539,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
@@ -2304,12 +1553,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
@@ -2323,15 +1566,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
@@ -2339,26 +1574,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
@@ -2367,12 +1588,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
@@ -2390,15 +1605,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
@@ -2406,26 +1613,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
@@ -2434,12 +1627,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
@@ -2453,15 +1640,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
@@ -2469,26 +1648,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
@@ -2497,12 +1662,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
@@ -2516,15 +1675,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
@@ -2532,26 +1683,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
@@ -2560,12 +1697,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
@@ -2579,15 +1710,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
@@ -2595,26 +1718,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
@@ -2623,12 +1732,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
@@ -2646,15 +1749,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
@@ -2662,26 +1757,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
@@ -2690,12 +1771,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
@@ -2713,55 +1788,62 @@ SOURCE=..\..\src\msw\mslu.cpp
 \r
 SOURCE=..\..\src\msw\nativdlg.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
+\r
 \r
-# PROP Exclude_From_Build 1\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
+# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 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\nativewin.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
+# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
+# PROP Exclude_From_Build 1\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
@@ -2776,15 +1858,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
@@ -2792,26 +1866,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
@@ -2820,12 +1880,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
@@ -2843,15 +1897,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
@@ -2859,40 +1905,20 @@ 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
+!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
@@ -2926,15 +1952,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
@@ -2942,26 +1960,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
@@ -2970,12 +1974,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
@@ -2989,15 +1987,7 @@ SOURCE=..\..\src\msw\radiobox.cpp
 \r
 SOURCE=..\..\src\msw\radiobut.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -3005,26 +1995,12 @@ SOURCE=..\..\src\msw\radiobut.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -3033,12 +2009,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
@@ -3060,15 +2030,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
@@ -3076,26 +2038,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
@@ -3104,12 +2052,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
@@ -3125,17 +2067,9 @@ SOURCE=..\..\src\msw\settings.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\slider95.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
+SOURCE=..\..\src\msw\slider.cpp\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
@@ -3143,26 +2077,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
@@ -3171,12 +2091,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
@@ -3190,15 +2104,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
@@ -3206,26 +2112,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
@@ -3234,12 +2126,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
@@ -3253,15 +2139,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
@@ -3269,26 +2147,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
@@ -3297,12 +2161,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
@@ -3316,15 +2174,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
@@ -3332,26 +2182,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
@@ -3360,12 +2196,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
@@ -3379,15 +2209,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
@@ -3395,26 +2217,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
@@ -3423,12 +2231,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
@@ -3440,17 +2242,9 @@ SOURCE=..\..\src\msw\statbox.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\statbr95.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
+SOURCE=..\..\src\msw\statline.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -3458,26 +2252,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
@@ -3486,12 +2266,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
@@ -3503,17 +2277,9 @@ SOURCE=..\..\src\msw\statbr95.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\statline.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
+SOURCE=..\..\src\msw\stattext.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -3521,26 +2287,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
@@ -3549,12 +2301,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
@@ -3566,17 +2312,9 @@ SOURCE=..\..\src\msw\statline.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\stattext.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
+SOURCE=..\..\src\msw\statusbar.cpp\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
@@ -3584,26 +2322,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
@@ -3612,12 +2336,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
@@ -3631,15 +2349,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
@@ -3647,26 +2357,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
@@ -3675,12 +2371,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
@@ -3692,17 +2382,9 @@ SOURCE=..\..\src\msw\tabctrl.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-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
@@ -3710,26 +2392,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
@@ -3738,12 +2406,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
@@ -3755,17 +2417,9 @@ SOURCE=..\..\src\msw\tbar95.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\textctrl.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
+SOURCE=..\..\src\msw\textentry.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -3773,26 +2427,12 @@ SOURCE=..\..\src\msw\textctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -3801,12 +2441,6 @@ SOURCE=..\..\src\msw\textctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
@@ -3820,55 +2454,62 @@ SOURCE=..\..\src\msw\textctrl.cpp
 \r
 SOURCE=..\..\src\msw\tglbtn.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
+# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 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
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
+SOURCE=..\..\src\msw\toolbar.cpp\r
+\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
@@ -3891,15 +2532,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
@@ -3907,26 +2540,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
@@ -3935,12 +2554,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
@@ -3966,38 +2579,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
@@ -4006,14 +2599,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
@@ -4041,26 +2626,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
@@ -4069,26 +2640,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
@@ -4128,26 +2685,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
@@ -4156,26 +2699,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
@@ -4203,26 +2732,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
@@ -4231,26 +2746,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
@@ -4270,26 +2771,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
@@ -4298,26 +2785,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
@@ -4337,26 +2810,12 @@ SOURCE=..\..\src\generic\filectrlg.cpp
 \r
 SOURCE=..\..\src\generic\filedlgg.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4365,26 +2824,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
@@ -4404,26 +2849,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
@@ -4432,26 +2863,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
@@ -4475,26 +2892,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
@@ -4503,26 +2906,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
@@ -4542,54 +2931,26 @@ 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
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -4605,26 +2966,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
@@ -4633,26 +2980,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
 \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
@@ -4710,17 +3043,17 @@ SOURCE=..\..\src\generic\srchctlg.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\generic\statusbr.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
+SOURCE=..\..\src\generic\statbmpg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
+SOURCE=..\..\src\generic\stattextg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-# PROP Exclude_From_Build 1\r
+SOURCE=..\..\src\generic\statusbr.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
@@ -4728,26 +3061,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
@@ -4756,12 +3075,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
@@ -4775,26 +3088,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
@@ -4803,26 +3102,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
@@ -4870,26 +3155,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
@@ -4898,26 +3169,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
@@ -4933,26 +3190,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
@@ -4961,26 +3204,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
@@ -4996,26 +3225,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
@@ -5024,26 +3239,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
@@ -5059,26 +3260,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
@@ -5087,26 +3274,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
@@ -5122,26 +3295,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
@@ -5150,26 +3309,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
@@ -5183,28 +3328,14 @@ SOURCE=..\..\src\univ\choice.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\colschem.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\combobox.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5213,26 +3344,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
@@ -5246,28 +3363,14 @@ SOURCE=..\..\src\univ\colschem.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\combobox.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\control.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5276,26 +3379,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
@@ -5309,28 +3398,14 @@ SOURCE=..\..\src\univ\combobox.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\control.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\ctrlrend.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5339,26 +3414,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
@@ -5372,56 +3433,28 @@ SOURCE=..\..\src\univ\control.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\ctrlrend.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\dialog.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5435,28 +3468,14 @@ SOURCE=..\..\src\univ\ctrlrend.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\dialog.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\framuniv.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\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
@@ -5465,26 +3484,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
@@ -5498,28 +3503,14 @@ SOURCE=..\..\src\univ\dialog.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\framuniv.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\gauge.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5528,26 +3519,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
@@ -5561,28 +3538,14 @@ SOURCE=..\..\src\univ\framuniv.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\gauge.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\themes\gtk.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5591,26 +3554,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
@@ -5624,28 +3573,14 @@ SOURCE=..\..\src\univ\gauge.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\themes\gtk.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\inpcons.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5654,26 +3589,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
@@ -5687,28 +3608,14 @@ SOURCE=..\..\src\univ\themes\gtk.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\inpcons.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\inphand.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5717,26 +3624,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
@@ -5750,28 +3643,14 @@ SOURCE=..\..\src\univ\inpcons.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\inphand.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\listbox.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5780,26 +3659,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
@@ -5813,28 +3678,14 @@ SOURCE=..\..\src\univ\inphand.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\listbox.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\menu.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5843,26 +3694,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
@@ -5876,28 +3713,14 @@ SOURCE=..\..\src\univ\listbox.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\menu.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\themes\metal.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5906,26 +3729,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
@@ -5939,28 +3748,14 @@ SOURCE=..\..\src\univ\menu.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\themes\metal.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\themes\mono.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -5969,26 +3764,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
@@ -6002,28 +3783,14 @@ SOURCE=..\..\src\univ\themes\metal.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\themes\mono.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\notebook.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6032,26 +3799,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
@@ -6065,28 +3818,14 @@ SOURCE=..\..\src\univ\themes\mono.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\notebook.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\radiobox.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6095,26 +3834,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
@@ -6128,28 +3853,14 @@ SOURCE=..\..\src\univ\notebook.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\radiobox.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\radiobut.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6158,26 +3869,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
@@ -6191,28 +3888,14 @@ SOURCE=..\..\src\univ\radiobox.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\radiobut.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\scrarrow.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6221,26 +3904,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
@@ -6254,28 +3923,14 @@ SOURCE=..\..\src\univ\radiobut.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\scrarrow.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\scrolbar.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6284,26 +3939,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
@@ -6317,28 +3958,14 @@ SOURCE=..\..\src\univ\scrarrow.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\scrolbar.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\scrthumb.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -6347,26 +3974,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
@@ -6380,28 +3993,14 @@ SOURCE=..\..\src\univ\scrolbar.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\univ\scrthumb.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
+SOURCE=..\..\src\univ\settingsuniv.cpp\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
@@ -6410,26 +4009,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
@@ -6445,26 +4030,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
@@ -6473,26 +4044,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
@@ -6503,30 +4060,16 @@ SOURCE=..\..\src\univ\slider.cpp
 \r
 !ENDIF\r
 \r
-# End Source File\r
-# Begin Source File\r
-\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
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
+# End Source File\r
+# Begin Source File\r
 \r
+SOURCE=..\..\src\univ\spinbutt.cpp\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
-# PROP Exclude_From_Build 1\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
@@ -6536,26 +4079,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
@@ -6571,26 +4100,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
@@ -6599,26 +4114,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
@@ -6634,26 +4135,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
@@ -6662,26 +4149,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
@@ -6697,26 +4170,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
@@ -6725,26 +4184,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
@@ -6760,26 +4205,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
@@ -6788,26 +4219,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
@@ -6823,26 +4240,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
@@ -6851,26 +4254,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
@@ -6886,26 +4275,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
@@ -6914,26 +4289,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
@@ -6949,26 +4310,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
@@ -6977,26 +4324,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
@@ -7012,26 +4345,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
@@ -7040,26 +4359,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
@@ -7075,26 +4380,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
@@ -7103,26 +4394,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
@@ -7138,26 +4415,12 @@ SOURCE=..\..\src\univ\theme.cpp
 \r
 SOURCE=..\..\src\univ\toolbar.cpp\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -7166,26 +4429,12 @@ SOURCE=..\..\src\univ\toolbar.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -7201,26 +4450,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
@@ -7229,26 +4464,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
@@ -7264,26 +4485,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
@@ -7292,26 +4499,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
@@ -7327,26 +4520,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
@@ -7355,26 +4534,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
@@ -7394,19 +4559,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
@@ -7418,7 +4571,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
@@ -7428,7 +4581,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
@@ -7438,38 +4591,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
@@ -7482,7 +4603,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
@@ -7492,7 +4613,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
@@ -7502,26 +4623,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
@@ -7529,7 +4630,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
@@ -7539,7 +4640,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
@@ -7549,38 +4650,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
@@ -7593,7 +4662,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
@@ -7603,7 +4672,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
@@ -7613,38 +4682,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
@@ -7694,6 +4731,10 @@ SOURCE=..\..\include\wx\msw\bmpbuttn.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\msw\bmpcbox.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\msw\brush.h\r
 # End Source File\r
 # Begin Source File\r
@@ -7702,6 +4743,10 @@ SOURCE=..\..\include\wx\msw\button.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\msw\calctrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\msw\caret.h\r
 # End Source File\r
 # Begin Source File\r
@@ -7762,6 +4807,10 @@ SOURCE=..\..\include\wx\msw\ole\dataobj2.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\msw\datecontrols.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\msw\datectrl.h\r
 # End Source File\r
 # Begin Source File\r
@@ -7838,7 +4887,7 @@ SOURCE=..\..\include\wx\msw\frame.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\msw\gauge95.h\r
+SOURCE=..\..\include\wx\msw\gauge.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -7848,7 +4897,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
@@ -7858,7 +4907,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
@@ -7868,27 +4917,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
@@ -7898,7 +4927,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
@@ -7908,27 +4937,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
@@ -7938,7 +4947,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
@@ -7948,27 +4957,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
@@ -7978,7 +4967,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
@@ -7988,26 +4977,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
@@ -8093,6 +5062,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
@@ -8141,7 +5114,7 @@ SOURCE=..\..\include\wx\msw\setup0.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\msw\slider95.h\r
+SOURCE=..\..\include\wx\msw\slider.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -8165,15 +5138,15 @@ SOURCE=..\..\include\wx\msw\statbox.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\msw\statbr95.h\r
+SOURCE=..\..\include\wx\msw\statline.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\msw\statline.h\r
+SOURCE=..\..\include\wx\msw\stattext.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\msw\stattext.h\r
+SOURCE=..\..\include\wx\msw\statusbar.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -8185,11 +5158,11 @@ SOURCE=..\..\include\wx\msw\taskbar.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\msw\tbar95.h\r
+SOURCE=..\..\include\wx\msw\textctrl.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\msw\textctrl.h\r
+SOURCE=..\..\include\wx\msw\textentry.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -8197,6 +5170,10 @@ SOURCE=..\..\include\wx\msw\tglbtn.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\msw\toolbar.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\msw\tooltip.h\r
 # End Source File\r
 # Begin Source File\r
@@ -8253,7 +5230,7 @@ SOURCE=..\..\include\wx\generic\buttonbar.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\generic\calctrl.h\r
+SOURCE=..\..\include\wx\generic\calctrlg.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -8373,6 +5350,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
@@ -8421,6 +5402,14 @@ SOURCE=..\..\include\wx\generic\srchctlg.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\generic\statbmpg.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\generic\stattextg.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\generic\statusbr.h\r
 # End Source File\r
 # Begin Source File\r
@@ -8685,6 +5674,10 @@ SOURCE=..\..\include\wx\access.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\propgrid\advprops.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\anidecod.h\r
 # End Source File\r
 # Begin Source File\r
@@ -8705,6 +5698,10 @@ SOURCE=..\..\include\wx\aui\aui.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\aui\auibar.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\aui\auibook.h\r
 # End Source File\r
 # Begin Source File\r
@@ -8837,10 +5834,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
@@ -8933,6 +5926,10 @@ SOURCE=..\..\include\wx\editlbox.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\propgrid\editors.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\effects.h\r
 # End Source File\r
 # Begin Source File\r
@@ -9141,6 +6138,10 @@ SOURCE=..\..\include\wx\listctrl.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\propgrid\manager.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\matrix.h\r
 # End Source File\r
 # Begin Source File\r
@@ -9173,6 +6174,10 @@ SOURCE=..\..\include\wx\msgdlg.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\nativewin.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\nonownedwnd.h\r
 # End Source File\r
 # Begin Source File\r
@@ -9181,6 +6186,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
@@ -9245,7 +6254,27 @@ SOURCE=..\..\include\wx\propdlg.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\ptr_scpd.h\r
+SOURCE=..\..\include\wx\propgrid\property.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\propgrid\propgrid.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\propgrid\propgriddefs.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\propgrid\propgridiface.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\propgrid\propgridpagestate.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\propgrid\props.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -9493,10 +6522,18 @@ SOURCE=..\..\include\wx\window.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\windowid.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\wizard.h\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\wrapsizer.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\wupdlock.h\r
 # End Source File\r
 # Begin Source File\r