Add a trivial benchmark for wxDateTime::ParseDate().

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

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index f5df6be9044738456c0dc05b54a0d1d07b76c220..13dcfb348c3705de422cca33f1a9ccd7511f8fd7 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 \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 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 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 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
 !MESSAGE "core - Win32 Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "core - Win32 Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE \r


@@ -43,32 +35,32 @@ CFG=core - Win32 Debug
 CPP=cl.exe\r
 RSC=rc.exe\r
 \r
 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
 \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 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
 # 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 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
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
+# 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\wxmswuniv292u_core_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /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\wxmswuniv292u_core_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /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 "NDEBUG" /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 "NDEBUG" /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 "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292u_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
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r

-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
+# 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 wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_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 wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292u_core_vc_custom.pdb"\r

 \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
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r


@@ -80,95 +72,45 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivuddll\core"\r
 # PROP Target_Dir ""\r
 # 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 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
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug\r
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL 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 wxUSE_UNICODE=0 /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 wxUSE_UNICODE=0 /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 wxUSE_UNICODE=0 /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 wxUSE_UNICODE=0 /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=0 /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__" /d wxUSE_UNICODE=0 /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 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\wxmswuniv292ud_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 "_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\wxmswuniv292ud_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 "_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 "_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 "_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 "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_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 "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv292ud_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
 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 ..\..\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 ..\..\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 wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_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 wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv292ud_core_vc_custom.pdb"\r

 \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
 \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 wxUSE_UNICODE=0 /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 wxUSE_UNICODE=0 /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 wxUSE_UNICODE=0 /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 wxUSE_UNICODE=0 /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 wxUSE_UNICODE=0 /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__" /d wxUSE_UNICODE=0 /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 ..\..\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 ..\..\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 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
 # 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 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
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
+# 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\wxmsw292u_core_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /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\wxmsw292u_core_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /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 "NDEBUG" /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_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 "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292u_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
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r

-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib"\r
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib"\r
+# 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 wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_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 wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292u_core_vc_custom.pdb"\r

 \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
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r


@@ -180,83 +122,33 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\core"\r
 # PROP Target_Dir ""\r
 # 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 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
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
+# 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\wxmsw292ud_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 "_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\wxmsw292ud_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 "_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 "_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 "_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 "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_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 "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw292ud_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
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r

-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug\r
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug\r
+# 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 wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_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 wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw292ud_core_vc_custom.pdb"\r

 \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 wxUSE_UNICODE=0 /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 wxUSE_UNICODE=0 /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 wxUSE_UNICODE=0 /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 wxUSE_UNICODE=0 /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d wxUSE_UNICODE=0 /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__" /d wxUSE_UNICODE=0 /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 ..\..\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 ..\..\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
 \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 wxUSE_UNICODE=0 /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 wxUSE_UNICODE=0 /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 wxUSE_UNICODE=0 /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 wxUSE_UNICODE=0 /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 wxUSE_UNICODE=0 /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__" /d wxUSE_UNICODE=0 /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 ..\..\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 ..\..\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 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
 # 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 /opt:ref /opt:icf /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 "NDEBUG" /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 /opt:ref /opt:icf /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 "NDEBUG" /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
 # 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
 # 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
 \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
 # 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 "_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 "_UNICODE" /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 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
 # 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 wxUSE_UNICODE=0 /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 wxUSE_UNICODE=0 /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
 \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 wxUSE_UNICODE=0 /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 wxUSE_UNICODE=0 /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 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
 # 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 /opt:ref /opt:icf /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 "NDEBUG" /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 /opt:ref /opt:icf /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 "NDEBUG" /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
 # 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
 # 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
 \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
 # 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 "_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 "_UNICODE" /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 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
 # 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 wxUSE_UNICODE=0 /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 wxUSE_UNICODE=0 /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 wxUSE_UNICODE=0 /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 wxUSE_UNICODE=0 /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
 !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 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 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 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
 # Name "core - Win32 Release"\r
 # Name "core - Win32 Debug"\r
 # Begin Group "Common Sources"\r


@@ -460,6 +252,10 @@ SOURCE=..\..\src\common\accesscmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\affinematrix2d.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\anidecod.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\anidecod.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -476,10 +272,18 @@ SOURCE=..\..\src\common\artstd.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\arttango.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\bmpbase.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\src\common\bmpbase.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\bmpbtncmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\bookctrl.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\bookctrl.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -492,6 +296,14 @@ SOURCE=..\..\src\common\cairo.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\checkboxcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\common\checklstcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\choiccmn.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\choiccmn.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -516,6 +328,10 @@ SOURCE=..\..\src\common\colourcmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\colourdata.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\combocmn.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\combocmn.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -536,10 +352,6 @@ SOURCE=..\..\src\common\ctrlsub.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\common\datacmn.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r

 SOURCE=..\..\src\common\dcbase.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\dcbase.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -556,6 +368,10 @@ SOURCE=..\..\src\common\dcsvg.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\dirctrlcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\dlgcmn.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\dlgcmn.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -606,6 +422,10 @@ SOURCE=..\..\src\common\filectrlcmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\filehistorycmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\filepickercmn.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\filepickercmn.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -618,6 +438,10 @@ SOURCE=..\..\src\common\fontcmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\fontdata.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\fontenumcmn.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\fontenumcmn.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -666,6 +490,14 @@ SOURCE=..\..\src\common\graphcmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\headercolcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\common\headerctrlcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\helpbase.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\helpbase.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -738,6 +570,10 @@ SOURCE=..\..\src\common\listctrlcmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\markupparser.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\matrix.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\matrix.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -746,6 +582,10 @@ SOURCE=..\..\src\common\menucmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\mousemanager.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\msgout.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\msgout.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -758,10 +598,22 @@ SOURCE=..\..\src\common\overlaycmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\ownerdrwcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\common\panelcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\paper.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\src\common\paper.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\persist.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\pickerbase.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\pickerbase.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -778,10 +630,18 @@ SOURCE=..\..\src\common\quantize.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\radiobtncmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\radiocmn.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\src\common\radiocmn.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\rearrangectrl.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\rendcmn.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\rendcmn.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -790,6 +650,10 @@ SOURCE=..\..\src\common\rgncmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\scrolbarcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\settcmn.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\settcmn.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -798,6 +662,18 @@ SOURCE=..\..\src\common\sizer.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\slidercmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\common\spinbtncmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\common\spinctrlcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\srchcmn.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\srchcmn.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -806,6 +682,18 @@ SOURCE=..\..\src\common\statbar.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\statbmpcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\common\statboxcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\common\statlinecmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\stattextcmn.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\stattextcmn.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -834,6 +722,10 @@ SOURCE=..\..\src\common\treebase.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\uiactioncmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\utilscmn.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\utilscmn.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -846,6 +738,10 @@ SOURCE=..\..\src\common\validate.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\valnum.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\valtext.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\valtext.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -854,6 +750,14 @@ SOURCE=..\..\src\common\wincmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # 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
 SOURCE=..\..\src\common\xpmdecod.cpp\r
 # End Source File\r
 # End Group\r


@@ -864,15 +768,7 @@ SOURCE=..\..\src\common\xpmdecod.cpp
 \r
 SOURCE=..\..\src\msw\accel.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -880,26 +776,12 @@ SOURCE=..\..\src\msw\accel.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -908,12 +790,6 @@ SOURCE=..\..\src\msw\accel.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -927,15 +803,7 @@ SOURCE=..\..\src\msw\accel.cpp
 \r
 SOURCE=..\..\src\msw\ole\access.cpp\r
 \r
 \r
 SOURCE=..\..\src\msw\ole\access.cpp\r
 \r

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r

 \r
 # PROP Exclude_From_Build 1\r
 \r
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -943,26 +811,12 @@ SOURCE=..\..\src\msw\ole\access.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -971,16 +825,10 @@ SOURCE=..\..\src\msw\ole\access.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
 \r
 # PROP Exclude_From_Build 1\r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r

 \r
 \r
 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r

 \r
 \r
 !ENDIF\r
 \r
 \r
 !ENDIF\r


@@ -988,69 +836,80 @@ SOURCE=..\..\src\msw\ole\access.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # 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
+SOURCE=..\..\src\msw\ole\activex.cpp\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\bitmap.cpp\r
+SOURCE=..\..\src\msw\app.cpp\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\bmpbuttn.cpp\r
+SOURCE=..\..\src\msw\artmsw.cpp\r

 \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
 \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
 \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
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r

 \r
 \r
 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r

 \r
 \r
 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
+!ENDIF\r

 \r
 \r

+# End Source File\r
+# Begin Source File\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
+SOURCE=..\..\src\msw\ole\automtn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\msw\bitmap.cpp\r
+# End Source File\r
+# Begin Source File\r

 \r
 \r

+SOURCE=..\..\src\msw\bmpbuttn.cpp\r

 \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
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r

 \r
 \r

-# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r

 \r
 \r

-# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r

 \r
 \r

+# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r

 \r
 \r

+# PROP Exclude_From_Build 1\r

 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r


@@ -1069,15 +928,7 @@ SOURCE=..\..\src\msw\brush.cpp
 \r
 SOURCE=..\..\src\msw\button.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -1085,26 +936,12 @@ SOURCE=..\..\src\msw\button.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -1113,12 +950,6 @@ SOURCE=..\..\src\msw\button.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -1136,15 +967,7 @@ SOURCE=..\..\src\msw\caret.cpp
 \r
 SOURCE=..\..\src\msw\checkbox.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -1152,26 +975,12 @@ SOURCE=..\..\src\msw\checkbox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -1180,12 +989,6 @@ SOURCE=..\..\src\msw\checkbox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -1199,15 +1002,7 @@ SOURCE=..\..\src\msw\checkbox.cpp
 \r
 SOURCE=..\..\src\msw\checklst.cpp\r
 \r
 \r
 SOURCE=..\..\src\msw\checklst.cpp\r
 \r

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r

 \r
 # PROP Exclude_From_Build 1\r
 \r
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -1215,26 +1010,12 @@ SOURCE=..\..\src\msw\checklst.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -1243,12 +1024,6 @@ SOURCE=..\..\src\msw\checklst.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -1262,15 +1037,7 @@ SOURCE=..\..\src\msw\checklst.cpp
 \r
 SOURCE=..\..\src\msw\choice.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -1278,26 +1045,12 @@ SOURCE=..\..\src\msw\choice.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -1306,12 +1059,6 @@ SOURCE=..\..\src\msw\choice.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -1329,15 +1076,7 @@ SOURCE=..\..\src\msw\clipbrd.cpp
 \r
 SOURCE=..\..\src\msw\colordlg.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -1345,26 +1084,12 @@ SOURCE=..\..\src\msw\colordlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -1373,12 +1098,6 @@ SOURCE=..\..\src\msw\colordlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -1396,15 +1115,7 @@ SOURCE=..\..\src\msw\colour.cpp
 \r
 SOURCE=..\..\src\msw\combo.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -1412,26 +1123,12 @@ SOURCE=..\..\src\msw\combo.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -1440,12 +1137,6 @@ SOURCE=..\..\src\msw\combo.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -1459,15 +1150,7 @@ SOURCE=..\..\src\msw\combo.cpp
 \r
 SOURCE=..\..\src\msw\combobox.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -1475,26 +1158,12 @@ SOURCE=..\..\src\msw\combobox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -1503,12 +1172,6 @@ SOURCE=..\..\src\msw\combobox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -1522,15 +1185,7 @@ SOURCE=..\..\src\msw\combobox.cpp
 \r
 SOURCE=..\..\src\msw\control.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -1538,26 +1193,12 @@ SOURCE=..\..\src\msw\control.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -1566,12 +1207,6 @@ SOURCE=..\..\src\msw\control.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -1617,15 +1252,7 @@ SOURCE=..\..\src\msw\dcscreen.cpp
 \r
 SOURCE=..\..\src\msw\dialog.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -1633,26 +1260,12 @@ SOURCE=..\..\src\msw\dialog.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -1661,12 +1274,6 @@ SOURCE=..\..\src\msw\dialog.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -1688,15 +1295,7 @@ SOURCE=..\..\src\msw\dib.cpp
 \r
 SOURCE=..\..\src\msw\dirdlg.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -1704,26 +1303,12 @@ SOURCE=..\..\src\msw\dirdlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -1732,12 +1317,6 @@ SOURCE=..\..\src\msw\dirdlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -1755,41 +1334,19 @@ SOURCE=..\..\src\msw\display.cpp
 \r
 SOURCE=..\..\src\msw\dragimag.cpp\r
 \r
 \r
 SOURCE=..\..\src\msw\dragimag.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
 \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
 \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

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r

 \r
 \r

-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r

 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r


@@ -1799,12 +1356,6 @@ SOURCE=..\..\src\msw\dragimag.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -1834,15 +1385,7 @@ SOURCE=..\..\src\msw\evtloop.cpp
 \r
 SOURCE=..\..\src\msw\fdrepdlg.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -1850,26 +1393,12 @@ SOURCE=..\..\src\msw\fdrepdlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -1878,12 +1407,6 @@ SOURCE=..\..\src\msw\fdrepdlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -1897,15 +1420,7 @@ SOURCE=..\..\src\msw\fdrepdlg.cpp
 \r
 SOURCE=..\..\src\msw\filedlg.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -1913,26 +1428,12 @@ SOURCE=..\..\src\msw\filedlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -1941,12 +1442,6 @@ SOURCE=..\..\src\msw\filedlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -1964,15 +1459,7 @@ SOURCE=..\..\src\msw\font.cpp
 \r
 SOURCE=..\..\src\msw\fontdlg.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -1980,26 +1467,12 @@ SOURCE=..\..\src\msw\fontdlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -2008,12 +1481,6 @@ SOURCE=..\..\src\msw\fontdlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -2035,15 +1502,7 @@ SOURCE=..\..\src\msw\fontutil.cpp
 \r
 SOURCE=..\..\src\msw\frame.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -2051,26 +1510,12 @@ SOURCE=..\..\src\msw\frame.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -2079,12 +1524,6 @@ SOURCE=..\..\src\msw\frame.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -2096,17 +1535,9 @@ SOURCE=..\..\src\msw\frame.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # 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
+SOURCE=..\..\src\msw\gauge.cpp\r

 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -2114,26 +1545,12 @@ SOURCE=..\..\src\msw\gauge95.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -2142,12 +1559,6 @@ SOURCE=..\..\src\msw\gauge95.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -2175,7 +1586,38 @@ SOURCE=..\..\src\msw\graphics.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\gsockmsw.cpp\r
+SOURCE=..\..\src\msw\headerctrl.cpp\r
+\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL 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 Universal Debug"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
+\r
+\r
+!ENDIF\r
+\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r


@@ -2197,15 +1639,7 @@ SOURCE=..\..\src\msw\imaglist.cpp
 \r
 SOURCE=..\..\src\msw\iniconf.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -2213,26 +1647,12 @@ SOURCE=..\..\src\msw\iniconf.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -2241,12 +1661,6 @@ SOURCE=..\..\src\msw\iniconf.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -2260,15 +1674,7 @@ SOURCE=..\..\src\msw\iniconf.cpp
 \r
 SOURCE=..\..\src\msw\listbox.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -2276,26 +1682,12 @@ SOURCE=..\..\src\msw\listbox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -2304,12 +1696,6 @@ SOURCE=..\..\src\msw\listbox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -2323,15 +1709,7 @@ SOURCE=..\..\src\msw\listbox.cpp
 \r
 SOURCE=..\..\src\msw\listctrl.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -2339,26 +1717,12 @@ SOURCE=..\..\src\msw\listctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -2367,12 +1731,6 @@ SOURCE=..\..\src\msw\listctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -2390,15 +1748,7 @@ SOURCE=..\..\src\msw\main.cpp
 \r
 SOURCE=..\..\src\msw\mdi.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -2406,26 +1756,12 @@ SOURCE=..\..\src\msw\mdi.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -2434,12 +1770,6 @@ SOURCE=..\..\src\msw\mdi.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -2453,15 +1783,7 @@ SOURCE=..\..\src\msw\mdi.cpp
 \r
 SOURCE=..\..\src\msw\menu.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -2469,26 +1791,12 @@ SOURCE=..\..\src\msw\menu.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -2497,12 +1805,6 @@ SOURCE=..\..\src\msw\menu.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -2516,41 +1818,19 @@ SOURCE=..\..\src\msw\menu.cpp
 \r
 SOURCE=..\..\src\msw\menuitem.cpp\r
 \r
 \r
 SOURCE=..\..\src\msw\menuitem.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
 \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
 \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

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r

 \r
 \r

-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r

 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r


@@ -2560,12 +1840,6 @@ SOURCE=..\..\src\msw\menuitem.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -2579,15 +1853,7 @@ SOURCE=..\..\src\msw\menuitem.cpp
 \r
 SOURCE=..\..\src\msw\metafile.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -2595,26 +1861,12 @@ SOURCE=..\..\src\msw\metafile.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -2623,12 +1875,6 @@ SOURCE=..\..\src\msw\metafile.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -2646,15 +1892,7 @@ SOURCE=..\..\src\msw\minifram.cpp
 \r
 SOURCE=..\..\src\msw\msgdlg.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -2662,26 +1900,12 @@ SOURCE=..\..\src\msw\msgdlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -2690,12 +1914,6 @@ SOURCE=..\..\src\msw\msgdlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -2713,55 +1931,62 @@ SOURCE=..\..\src\msw\mslu.cpp
 \r
 SOURCE=..\..\src\msw\nativdlg.cpp\r
 \r
 \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
 \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
 \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

 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r

 \r
 \r

+# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r

 \r
 \r
 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r

 \r
 \r
 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
+!ENDIF\r
+\r
+# End Source File\r
+# Begin Source File\r

 \r
 \r

+SOURCE=..\..\src\msw\nativewin.cpp\r

 \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
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r

 \r
 \r

-# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r

 \r
 \r

-# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r

 \r
 \r

+# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r

 \r
 \r

+# PROP Exclude_From_Build 1\r

 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r


@@ -2776,15 +2001,7 @@ SOURCE=..\..\src\msw\nativdlg.cpp
 \r
 SOURCE=..\..\src\msw\notebook.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -2792,26 +2009,12 @@ SOURCE=..\..\src\msw\notebook.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -2820,12 +2023,6 @@ SOURCE=..\..\src\msw\notebook.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -2843,55 +2040,66 @@ SOURCE=..\..\src\msw\ole\oleutils.cpp
 \r
 SOURCE=..\..\src\msw\ownerdrw.cpp\r
 \r
 \r
 SOURCE=..\..\src\msw\ownerdrw.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
 \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
 \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
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r

 \r
 \r
 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r

 \r
 \r
 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
+!ENDIF\r

 \r
 \r

+# End Source File\r
+# Begin Source File\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
+SOURCE=..\..\src\msw\palette.cpp\r
+# End Source File\r
+# Begin Source File\r

 \r
 \r

+SOURCE=..\..\src\msw\panel.cpp\r

 \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
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r

 \r
 \r

-# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r

 \r
 \r

-# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r

 \r
 \r

+# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r

 \r
 \r

+# PROP Exclude_From_Build 1\r

 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r


@@ -2904,10 +2112,6 @@ SOURCE=..\..\src\msw\ownerdrw.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\palette.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r

 SOURCE=..\..\src\msw\pen.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\msw\pen.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -2924,57 +2128,64 @@ SOURCE=..\..\src\msw\printwin.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\radiobox.cpp\r
+SOURCE=..\..\src\msw\progdlg.cpp\r

 \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
 \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
 \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

 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r

 \r
 \r

+# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r

 \r
 \r
 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r

 \r
 \r
 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
+!ENDIF\r

 \r
 \r

+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\msw\radiobox.cpp\r

 \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
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r

 \r
 \r

-# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r

 \r
 \r

-# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r

 \r
 \r

+# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r

 \r
 \r

+# PROP Exclude_From_Build 1\r

 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r


@@ -2989,15 +2200,7 @@ SOURCE=..\..\src\msw\radiobox.cpp
 \r
 SOURCE=..\..\src\msw\radiobut.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -3005,26 +2208,12 @@ SOURCE=..\..\src\msw\radiobut.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -3033,12 +2222,6 @@ SOURCE=..\..\src\msw\radiobut.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -3058,57 +2241,64 @@ SOURCE=..\..\src\msw\renderer.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\scrolbar.cpp\r
+SOURCE=..\..\src\msw\richmsgdlg.cpp\r

 \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
 \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
 \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

 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r

 \r
 \r

+# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r

 \r
 \r
 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r

 \r
 \r
 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
+!ENDIF\r
+\r
+# End Source File\r
+# Begin Source File\r

 \r
 \r

+SOURCE=..\..\src\msw\scrolbar.cpp\r

 \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
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r

 \r
 \r

-# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r

 \r
 \r

-# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r

 \r
 \r

+# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r

 \r
 \r

+# PROP Exclude_From_Build 1\r

 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r


@@ -3125,17 +2315,9 @@ SOURCE=..\..\src\msw\settings.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\slider95.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
+SOURCE=..\..\src\msw\slider.cpp\r

 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -3143,26 +2325,12 @@ SOURCE=..\..\src\msw\slider95.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -3171,12 +2339,6 @@ SOURCE=..\..\src\msw\slider95.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -3190,55 +2352,27 @@ SOURCE=..\..\src\msw\slider95.cpp
 \r
 SOURCE=..\..\src\msw\spinbutt.cpp\r
 \r
 \r
 SOURCE=..\..\src\msw\spinbutt.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
 \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
 \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

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r

 \r
 \r

-# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r

 \r
 \r

+# PROP Exclude_From_Build 1\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
-\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
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r

 \r
 \r

+# PROP Exclude_From_Build 1\r

 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r


@@ -3253,15 +2387,7 @@ SOURCE=..\..\src\msw\spinbutt.cpp
 \r
 SOURCE=..\..\src\msw\spinctrl.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -3269,26 +2395,12 @@ SOURCE=..\..\src\msw\spinctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -3297,12 +2409,6 @@ SOURCE=..\..\src\msw\spinctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -3316,15 +2422,7 @@ SOURCE=..\..\src\msw\spinctrl.cpp
 \r
 SOURCE=..\..\src\msw\statbmp.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -3332,26 +2430,12 @@ SOURCE=..\..\src\msw\statbmp.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -3360,12 +2444,6 @@ SOURCE=..\..\src\msw\statbmp.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -3379,15 +2457,7 @@ SOURCE=..\..\src\msw\statbmp.cpp
 \r
 SOURCE=..\..\src\msw\statbox.cpp\r
 \r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -3395,26 +2465,12 @@ SOURCE=..\..\src\msw\statbox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -3423,12 +2479,6 @@ SOURCE=..\..\src\msw\statbox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -3440,17 +2490,9 @@ SOURCE=..\..\src\msw\statbox.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # 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
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -3458,26 +2500,12 @@ SOURCE=..\..\src\msw\statbr95.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -3486,12 +2514,6 @@ SOURCE=..\..\src\msw\statbr95.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -3503,17 +2525,9 @@ SOURCE=..\..\src\msw\statbr95.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # 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
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -3521,26 +2535,12 @@ SOURCE=..\..\src\msw\statline.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -3549,12 +2549,6 @@ SOURCE=..\..\src\msw\statline.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -3566,17 +2560,9 @@ SOURCE=..\..\src\msw\statline.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\stattext.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
+SOURCE=..\..\src\msw\statusbar.cpp\r

 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -3584,26 +2570,12 @@ SOURCE=..\..\src\msw\stattext.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -3612,12 +2584,6 @@ SOURCE=..\..\src\msw\stattext.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -3629,17 +2595,9 @@ SOURCE=..\..\src\msw\stattext.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \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
+SOURCE=..\..\src\msw\textctrl.cpp\r

 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -3647,26 +2605,12 @@ SOURCE=..\..\src\msw\tabctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -3675,12 +2619,6 @@ SOURCE=..\..\src\msw\tabctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -3692,17 +2630,9 @@ SOURCE=..\..\src\msw\tabctrl.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\tbar95.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
+SOURCE=..\..\src\msw\textentry.cpp\r

 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -3710,26 +2640,12 @@ SOURCE=..\..\src\msw\tbar95.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -3738,12 +2654,6 @@ SOURCE=..\..\src\msw\tbar95.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -3755,17 +2665,9 @@ SOURCE=..\..\src\msw\tbar95.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # 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\tglbtn.cpp\r

 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -3773,26 +2675,12 @@ SOURCE=..\..\src\msw\textctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -3801,12 +2689,6 @@ SOURCE=..\..\src\msw\textctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -3818,17 +2700,9 @@ SOURCE=..\..\src\msw\textctrl.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\textentry.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\toolbar.cpp\r

 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -3836,26 +2710,12 @@ SOURCE=..\..\src\msw\textentry.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -3864,12 +2724,6 @@ SOURCE=..\..\src\msw\textentry.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -3881,17 +2735,17 @@ SOURCE=..\..\src\msw\textentry.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\tglbtn.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
+SOURCE=..\..\src\msw\tooltip.cpp\r
+# End Source File\r
+# Begin Source File\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
+SOURCE=..\..\src\msw\toplevel.cpp\r
+# End Source File\r
+# Begin Source File\r

 \r
 \r

-# PROP Exclude_From_Build 1\r
+SOURCE=..\..\src\msw\treectrl.cpp\r

 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r


@@ -3899,26 +2753,12 @@ SOURCE=..\..\src\msw\tglbtn.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -3927,13 +2767,7 @@ SOURCE=..\..\src\msw\tglbtn.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"\r


@@ -3944,74 +2778,7 @@ SOURCE=..\..\src\msw\tglbtn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\tooltip.cpp\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\msw\toplevel.cpp\r
-# End Source File\r
-# Begin Source File\r
-\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
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\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
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
-\r
-\r
-!ENDIF\r
-\r
+SOURCE=..\..\src\msw\uiaction.cpp\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r


@@ -4029,38 +2796,18 @@ SOURCE=..\..\src\msw\uxtheme.cpp
 \r
 SOURCE=..\..\src\msw\version.rc\r
 \r
 \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
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -4069,14 +2816,6 @@ SOURCE=..\..\src\msw\version.rc
 \r
 # PROP Exclude_From_Build 1\r
 \r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -4104,26 +2843,12 @@ SOURCE=..\..\src\msw\window.cpp
 \r
 SOURCE=..\..\src\generic\accel.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -4132,26 +2857,12 @@ SOURCE=..\..\src\generic\accel.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -4191,26 +2902,12 @@ SOURCE=..\..\src\generic\collpaneg.cpp
 \r
 SOURCE=..\..\src\generic\colrdlgg.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -4219,26 +2916,12 @@ SOURCE=..\..\src\generic\colrdlgg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -4266,26 +2949,12 @@ SOURCE=..\..\src\generic\dirctrlg.cpp
 \r
 SOURCE=..\..\src\generic\dirdlgg.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -4294,26 +2963,12 @@ SOURCE=..\..\src\generic\dirdlgg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -4333,26 +2988,12 @@ SOURCE=..\..\src\generic\dragimgg.cpp
 \r
 SOURCE=..\..\src\generic\fdrepdlg.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -4361,26 +3002,12 @@ SOURCE=..\..\src\generic\fdrepdlg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -4400,26 +3027,12 @@ SOURCE=..\..\src\generic\filectrlg.cpp
 \r
 SOURCE=..\..\src\generic\filedlgg.cpp\r
 \r
 \r
 SOURCE=..\..\src\generic\filedlgg.cpp\r
 \r

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -4428,26 +3041,12 @@ SOURCE=..\..\src\generic\filedlgg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -4467,26 +3066,12 @@ SOURCE=..\..\src\generic\filepickerg.cpp
 \r
 SOURCE=..\..\src\generic\fontdlgg.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -4495,26 +3080,12 @@ SOURCE=..\..\src\generic\fontdlgg.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -4532,32 +3103,30 @@ SOURCE=..\..\src\generic\fontpickerg.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\generic\listbkg.cpp\r
+SOURCE=..\..\src\generic\graphicc.cpp\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\generic\listctrl.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
+SOURCE=..\..\src\generic\headerctrlg.cpp\r
+# End Source File\r
+# Begin Source File\r

 \r
 \r

+SOURCE=..\..\src\generic\infobar.cpp\r
+# End Source File\r
+# Begin Source File\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
+SOURCE=..\..\src\generic\listbkg.cpp\r
+# End Source File\r
+# Begin Source File\r

 \r
 \r

+SOURCE=..\..\src\generic\listctrl.cpp\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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -4566,26 +3135,12 @@ SOURCE=..\..\src\generic\listctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -4603,28 +3158,18 @@ SOURCE=..\..\src\generic\logg.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \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
+SOURCE=..\..\src\generic\markuptext.cpp\r
+# End Source File\r
+# Begin Source File\r

 \r
 \r

+SOURCE=..\..\src\generic\mdig.cpp\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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -4633,26 +3178,12 @@ SOURCE=..\..\src\generic\mdig.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -4667,65 +3198,6 @@ SOURCE=..\..\src\generic\mdig.cpp
 # Begin Source File\r
 \r
 SOURCE=..\..\src\generic\msgdlgg.cpp\r
 # Begin Source File\r
 \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
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
-\r
-\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
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ENDIF\r
-\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r


@@ -4753,6 +3225,10 @@ SOURCE=..\..\src\generic\renderg.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\generic\richmsgdlgg.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\generic\scrlwing.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\generic\scrlwing.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -4773,126 +3249,43 @@ SOURCE=..\..\src\generic\srchctlg.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\generic\statusbr.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\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
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
-\r
-\r
-!ENDIF\r
-\r
+SOURCE=..\..\src\generic\statbmpg.cpp\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \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
-\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
+SOURCE=..\..\src\generic\stattextg.cpp\r
+# End Source File\r
+# Begin Source File\r

 \r
 \r

-# PROP Exclude_From_Build 1\r
+SOURCE=..\..\src\generic\statusbr.cpp\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r

 \r
 # PROP Exclude_From_Build 1\r
 \r
 \r
 # PROP Exclude_From_Build 1\r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r

 \r
 # PROP Exclude_From_Build 1\r
 \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
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r

 \r
 \r
 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r

 \r
 \r
 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r

 \r
 # PROP Exclude_From_Build 1\r
 \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
 \r
 # PROP Exclude_From_Build 1\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r

-# PROP Exclude_From_Build 1\r

 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r

-# PROP Exclude_From_Build 1\r

 \r
 !ENDIF\r
 \r
 \r
 !ENDIF\r
 \r


@@ -4933,26 +3326,12 @@ SOURCE=..\..\src\generic\vscroll.cpp
 \r
 SOURCE=..\..\src\univ\bmpbuttn.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -4961,26 +3340,12 @@ SOURCE=..\..\src\univ\bmpbuttn.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -4996,26 +3361,12 @@ SOURCE=..\..\src\univ\bmpbuttn.cpp
 \r
 SOURCE=..\..\src\univ\button.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5024,26 +3375,12 @@ SOURCE=..\..\src\univ\button.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5059,26 +3396,12 @@ SOURCE=..\..\src\univ\button.cpp
 \r
 SOURCE=..\..\src\univ\checkbox.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5087,26 +3410,12 @@ SOURCE=..\..\src\univ\checkbox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5122,26 +3431,12 @@ SOURCE=..\..\src\univ\checkbox.cpp
 \r
 SOURCE=..\..\src\univ\checklst.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5150,26 +3445,12 @@ SOURCE=..\..\src\univ\checklst.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5185,89 +3466,12 @@ SOURCE=..\..\src\univ\checklst.cpp
 \r
 SOURCE=..\..\src\univ\choice.cpp\r
 \r
 \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
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
-\r
-\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
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ENDIF\r
-\r
-# 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
-\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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5276,26 +3480,12 @@ SOURCE=..\..\src\univ\colschem.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5311,26 +3501,12 @@ SOURCE=..\..\src\univ\colschem.cpp
 \r
 SOURCE=..\..\src\univ\combobox.cpp\r
 \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
-\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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5339,26 +3515,12 @@ SOURCE=..\..\src\univ\combobox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5374,26 +3536,12 @@ SOURCE=..\..\src\univ\combobox.cpp
 \r
 SOURCE=..\..\src\univ\control.cpp\r
 \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
-\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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5402,26 +3550,12 @@ SOURCE=..\..\src\univ\control.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5437,26 +3571,12 @@ SOURCE=..\..\src\univ\control.cpp
 \r
 SOURCE=..\..\src\univ\ctrlrend.cpp\r
 \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
-\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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5465,26 +3585,12 @@ SOURCE=..\..\src\univ\ctrlrend.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5500,26 +3606,12 @@ SOURCE=..\..\src\univ\ctrlrend.cpp
 \r
 SOURCE=..\..\src\univ\dialog.cpp\r
 \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
-\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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5528,26 +3620,12 @@ SOURCE=..\..\src\univ\dialog.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5563,39 +3641,19 @@ SOURCE=..\..\src\univ\dialog.cpp
 \r
 SOURCE=..\..\src\univ\framuniv.cpp\r
 \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
-\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
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r

 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 !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
+# PROP Exclude_From_Build 1\r

 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r


@@ -5603,14 +3661,6 @@ SOURCE=..\..\src\univ\framuniv.cpp
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5626,26 +3676,12 @@ SOURCE=..\..\src\univ\framuniv.cpp
 \r
 SOURCE=..\..\src\univ\gauge.cpp\r
 \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
-\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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5654,26 +3690,12 @@ SOURCE=..\..\src\univ\gauge.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5689,26 +3711,12 @@ SOURCE=..\..\src\univ\gauge.cpp
 \r
 SOURCE=..\..\src\univ\themes\gtk.cpp\r
 \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
-\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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5717,26 +3725,12 @@ SOURCE=..\..\src\univ\themes\gtk.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5752,26 +3746,12 @@ SOURCE=..\..\src\univ\themes\gtk.cpp
 \r
 SOURCE=..\..\src\univ\inpcons.cpp\r
 \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
-\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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5780,26 +3760,12 @@ SOURCE=..\..\src\univ\inpcons.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5815,26 +3781,12 @@ SOURCE=..\..\src\univ\inpcons.cpp
 \r
 SOURCE=..\..\src\univ\inphand.cpp\r
 \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
-\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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5843,26 +3795,12 @@ SOURCE=..\..\src\univ\inphand.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5878,26 +3816,12 @@ SOURCE=..\..\src\univ\inphand.cpp
 \r
 SOURCE=..\..\src\univ\listbox.cpp\r
 \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
-\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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5906,26 +3830,12 @@ SOURCE=..\..\src\univ\listbox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5941,26 +3851,12 @@ SOURCE=..\..\src\univ\listbox.cpp
 \r
 SOURCE=..\..\src\univ\menu.cpp\r
 \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
-\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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -5969,26 +3865,12 @@ SOURCE=..\..\src\univ\menu.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6004,26 +3886,12 @@ SOURCE=..\..\src\univ\menu.cpp
 \r
 SOURCE=..\..\src\univ\themes\metal.cpp\r
 \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
-\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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6032,26 +3900,12 @@ SOURCE=..\..\src\univ\themes\metal.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6067,26 +3921,12 @@ SOURCE=..\..\src\univ\themes\metal.cpp
 \r
 SOURCE=..\..\src\univ\themes\mono.cpp\r
 \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
-\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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6095,26 +3935,12 @@ SOURCE=..\..\src\univ\themes\mono.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6130,26 +3956,12 @@ SOURCE=..\..\src\univ\themes\mono.cpp
 \r
 SOURCE=..\..\src\univ\notebook.cpp\r
 \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
-\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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6158,26 +3970,12 @@ SOURCE=..\..\src\univ\notebook.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6193,26 +3991,12 @@ SOURCE=..\..\src\univ\notebook.cpp
 \r
 SOURCE=..\..\src\univ\radiobox.cpp\r
 \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
-\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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6221,26 +4005,12 @@ SOURCE=..\..\src\univ\radiobox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6256,26 +4026,12 @@ SOURCE=..\..\src\univ\radiobox.cpp
 \r
 SOURCE=..\..\src\univ\radiobut.cpp\r
 \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
-\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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6284,26 +4040,12 @@ SOURCE=..\..\src\univ\radiobut.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6319,53 +4061,60 @@ SOURCE=..\..\src\univ\radiobut.cpp
 \r
 SOURCE=..\..\src\univ\scrarrow.cpp\r
 \r
 \r
 SOURCE=..\..\src\univ\scrarrow.cpp\r
 \r

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r

 \r
 \r
 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r

 \r
 \r
 \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

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r

 \r
 \r

+# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r

 \r
 \r

-# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r

 \r
 \r

-# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r

 \r
 # PROP Exclude_From_Build 1\r
 \r
 \r
 # PROP Exclude_From_Build 1\r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r

 \r
 # PROP Exclude_From_Build 1\r
 \r
 \r
 # PROP Exclude_From_Build 1\r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
+!ENDIF\r

 \r
 \r

+# End Source File\r
+# Begin Source File\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
+SOURCE=..\..\src\univ\scrolbar.cpp\r

 \r
 \r

+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r

 \r
 \r

+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r

 \r
 \r

+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
+\r
+# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r

 \r
 # PROP Exclude_From_Build 1\r
 \r
 \r
 # PROP Exclude_From_Build 1\r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r

 \r
 \r

-# PROP Exclude_From_Build 1\r

 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r


@@ -6380,28 +4129,14 @@ SOURCE=..\..\src\univ\scrarrow.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # 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
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6410,26 +4145,12 @@ SOURCE=..\..\src\univ\scrolbar.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6443,28 +4164,14 @@ SOURCE=..\..\src\univ\scrolbar.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # 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
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
+SOURCE=..\..\src\univ\settingsuniv.cpp\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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6473,26 +4180,12 @@ SOURCE=..\..\src\univ\scrthumb.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6508,26 +4201,12 @@ SOURCE=..\..\src\univ\scrthumb.cpp
 \r
 SOURCE=..\..\src\univ\slider.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6536,26 +4215,12 @@ SOURCE=..\..\src\univ\slider.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6571,26 +4236,12 @@ SOURCE=..\..\src\univ\slider.cpp
 \r
 SOURCE=..\..\src\univ\spinbutt.cpp\r
 \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
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r

 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6599,26 +4250,12 @@ SOURCE=..\..\src\univ\spinbutt.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6634,26 +4271,12 @@ SOURCE=..\..\src\univ\spinbutt.cpp
 \r
 SOURCE=..\..\src\univ\statbmp.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6662,26 +4285,12 @@ SOURCE=..\..\src\univ\statbmp.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6697,26 +4306,12 @@ SOURCE=..\..\src\univ\statbmp.cpp
 \r
 SOURCE=..\..\src\univ\statbox.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6725,26 +4320,12 @@ SOURCE=..\..\src\univ\statbox.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6760,26 +4341,12 @@ SOURCE=..\..\src\univ\statbox.cpp
 \r
 SOURCE=..\..\src\univ\statline.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6788,26 +4355,12 @@ SOURCE=..\..\src\univ\statline.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6823,26 +4376,12 @@ SOURCE=..\..\src\univ\statline.cpp
 \r
 SOURCE=..\..\src\univ\stattext.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6851,26 +4390,12 @@ SOURCE=..\..\src\univ\stattext.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6886,26 +4411,12 @@ SOURCE=..\..\src\univ\stattext.cpp
 \r
 SOURCE=..\..\src\univ\statusbr.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6914,26 +4425,12 @@ SOURCE=..\..\src\univ\statusbr.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6949,26 +4446,12 @@ SOURCE=..\..\src\univ\statusbr.cpp
 \r
 SOURCE=..\..\src\univ\stdrend.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -6977,26 +4460,12 @@ SOURCE=..\..\src\univ\stdrend.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -7012,26 +4481,12 @@ SOURCE=..\..\src\univ\stdrend.cpp
 \r
 SOURCE=..\..\src\univ\textctrl.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -7040,26 +4495,12 @@ SOURCE=..\..\src\univ\textctrl.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -7075,26 +4516,12 @@ SOURCE=..\..\src\univ\textctrl.cpp
 \r
 SOURCE=..\..\src\univ\tglbtn.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -7103,26 +4530,12 @@ SOURCE=..\..\src\univ\tglbtn.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -7131,32 +4544,18 @@ SOURCE=..\..\src\univ\tglbtn.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \r
 \r
 # PROP Exclude_From_Build 1\r
 \r

-!ENDIF\r
-\r
-# End Source File\r
-# Begin Source File\r
-\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
-\r
+!ENDIF\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
+# End Source File\r
+# Begin Source File\r

 \r
 \r

+SOURCE=..\..\src\univ\theme.cpp\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r

 \r
 \r

-# PROP Exclude_From_Build 1\r

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r

 \r
 \r

-# PROP Exclude_From_Build 1\r

 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r


@@ -7166,26 +4565,12 @@ SOURCE=..\..\src\univ\theme.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -7201,26 +4586,12 @@ SOURCE=..\..\src\univ\theme.cpp
 \r
 SOURCE=..\..\src\univ\toolbar.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -7229,26 +4600,12 @@ SOURCE=..\..\src\univ\toolbar.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -7264,26 +4621,12 @@ SOURCE=..\..\src\univ\toolbar.cpp
 \r
 SOURCE=..\..\src\univ\topluniv.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -7292,26 +4635,12 @@ SOURCE=..\..\src\univ\topluniv.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -7327,26 +4656,12 @@ SOURCE=..\..\src\univ\topluniv.cpp
 \r
 SOURCE=..\..\src\univ\themes\win32.cpp\r
 \r
 \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
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -7355,26 +4670,12 @@ SOURCE=..\..\src\univ\themes\win32.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -7390,26 +4691,12 @@ SOURCE=..\..\src\univ\themes\win32.cpp
 \r
 SOURCE=..\..\src\univ\winuniv.cpp\r
 \r
 \r
 SOURCE=..\..\src\univ\winuniv.cpp\r
 \r

-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r

 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -7418,26 +4705,12 @@ SOURCE=..\..\src\univ\winuniv.cpp
 \r
 # PROP Exclude_From_Build 1\r
 \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 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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -7457,19 +4730,7 @@ SOURCE=..\..\src\univ\winuniv.cpp
 \r
 SOURCE=..\..\include\wx\msw\setup.h\r
 \r
 \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
 \r
 # Begin Custom Build - \r
 \r


@@ -7481,7 +4742,7 @@ SOURCE=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \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\setup.h\r
 InputPath=..\..\include\wx\msw\setup.h\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h\r
 InputPath=..\..\include\wx\msw\setup.h\r


@@ -7491,7 +4752,7 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \r
 \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
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h\r
 InputPath=..\..\include\wx\msw\setup.h\r


@@ -7501,38 +4762,6 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # Begin Custom Build - \r


@@ -7545,7 +4774,7 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \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\setup.h\r
 InputPath=..\..\include\wx\msw\setup.h\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h\r
 InputPath=..\..\include\wx\msw\setup.h\r


@@ -7555,7 +4784,7 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \r
 \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
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h\r
 InputPath=..\..\include\wx\msw\setup.h\r


@@ -7565,26 +4794,6 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 # End Custom Build\r
 \r
 \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
 !ENDIF\r
 \r
 # End Source File\r


@@ -7592,7 +4801,7 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 SOURCE=..\..\include\wx\univ\setup.h\r
 \r
 \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
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h\r
 InputPath=..\..\include\wx\univ\setup.h\r


@@ -7602,7 +4811,7 @@ InputPath=..\..\include\wx\univ\setup.h
 \r
 # End Custom Build\r
 \r
 \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
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h\r
 InputPath=..\..\include\wx\univ\setup.h\r


@@ -7612,38 +4821,6 @@ InputPath=..\..\include\wx\univ\setup.h
 \r
 # End Custom Build\r
 \r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # Begin Custom Build - \r


@@ -7656,7 +4833,7 @@ InputPath=..\..\include\wx\univ\setup.h
 \r
 # End Custom Build\r
 \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\setup.h\r
 InputPath=..\..\include\wx\univ\setup.h\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h\r
 InputPath=..\..\include\wx\univ\setup.h\r


@@ -7666,7 +4843,7 @@ InputPath=..\..\include\wx\univ\setup.h
 \r
 # End Custom Build\r
 \r
 \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
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h\r
 InputPath=..\..\include\wx\univ\setup.h\r


@@ -7676,38 +4853,6 @@ InputPath=..\..\include\wx\univ\setup.h
 \r
 # End Custom Build\r
 \r
 \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
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # Begin Custom Build - \r


@@ -7757,6 +4902,10 @@ SOURCE=..\..\include\wx\msw\bmpbuttn.h
 # End Source File\r
 # Begin Source File\r
 \r
 # 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
 SOURCE=..\..\include\wx\msw\brush.h\r
 # End Source File\r
 # Begin Source File\r


@@ -7765,6 +4914,10 @@ SOURCE=..\..\include\wx\msw\button.h
 # End Source File\r
 # Begin Source File\r
 \r
 # 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
 SOURCE=..\..\include\wx\msw\caret.h\r
 # End Source File\r
 # Begin Source File\r


@@ -7801,6 +4954,10 @@ SOURCE=..\..\include\wx\msw\combobox.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\msw\commandlinkbutton.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\msw\control.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\msw\control.h\r
 # End Source File\r
 # Begin Source File\r


@@ -7901,7 +5058,7 @@ SOURCE=..\..\include\wx\msw\frame.h
 # End Source File\r
 # Begin Source File\r
 \r
 # 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
 # End Source File\r
 # Begin Source File\r
 \r


@@ -7911,7 +5068,7 @@ SOURCE=..\..\include\wx\msw\gdiimage.h
 \r
 SOURCE=..\..\include\wx\msw\genrcdefs.h\r
 \r
 \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
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r


@@ -7921,7 +5078,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
 \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
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r


@@ -7931,27 +5088,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
 \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
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r


@@ -7961,77 +5098,37 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
 \r
 # End Custom Build\r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-\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
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r

 \r
 \r

-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h\r
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h\r

 InputPath=..\..\include\wx\msw\genrcdefs.h\r
 \r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
 \r

-"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"\r
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r

 \r
 # End Custom Build\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 \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
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h\r

 InputPath=..\..\include\wx\msw\genrcdefs.h\r
 \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
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"\r
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r

 \r
 # End Custom Build\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
 \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
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h\r

 InputPath=..\..\include\wx\msw\genrcdefs.h\r
 \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
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"\r
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r

 \r
 # End Custom Build\r
 \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
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r


@@ -8041,7 +5138,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
 \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
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r


@@ -8051,26 +5148,6 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 # End Custom Build\r
 \r
 \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
 !ENDIF\r
 \r
 # End Source File\r


@@ -8080,6 +5157,10 @@ SOURCE=..\..\include\wx\msw\glcanvas.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\msw\headerctrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\msw\helpbest.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\msw\helpbest.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8096,6 +5177,10 @@ SOURCE=..\..\include\wx\msw\htmlhelp.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\msw\hyperlink.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\msw\icon.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\msw\icon.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8156,14 +5241,26 @@ SOURCE=..\..\include\wx\msw\notebook.h
 # End Source File\r
 # Begin Source File\r
 \r
 # 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
 \r
 SOURCE=..\..\include\wx\msw\ole\oleutils.h\r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\msw\ownerdrw.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\msw\palette.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\msw\palette.h\r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\msw\panel.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\msw\pen.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\msw\pen.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8180,6 +5277,10 @@ SOURCE=..\..\include\wx\msw\printwin.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\msw\progdlg.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\msw\radiobox.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\msw\radiobox.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8196,6 +5297,10 @@ SOURCE=..\..\include\wx\msw\region.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\msw\richmsgdlg.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\msw\scrolbar.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\msw\scrolbar.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8204,7 +5309,7 @@ SOURCE=..\..\include\wx\msw\setup0.h
 # End Source File\r
 # Begin Source File\r
 \r
 # 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
 # End Source File\r
 # Begin Source File\r
 \r


@@ -8228,10 +5333,6 @@ SOURCE=..\..\include\wx\msw\statbox.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\include\wx\msw\statbr95.h\r
-# End Source File\r
-# Begin Source File\r
-\r

 SOURCE=..\..\include\wx\msw\statline.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\msw\statline.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8240,7 +5341,7 @@ SOURCE=..\..\include\wx\msw\stattext.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\include\wx\msw\tabctrl.h\r
+SOURCE=..\..\include\wx\msw\statusbar.h\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r


@@ -8248,10 +5349,6 @@ SOURCE=..\..\include\wx\msw\taskbar.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\include\wx\msw\tbar95.h\r
-# End Source File\r
-# Begin Source File\r
-\r

 SOURCE=..\..\include\wx\msw\textctrl.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\msw\textctrl.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8264,6 +5361,10 @@ SOURCE=..\..\include\wx\msw\tglbtn.h
 # End Source File\r
 # Begin Source File\r
 \r
 # 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
 SOURCE=..\..\include\wx\msw\tooltip.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8320,7 +5421,7 @@ SOURCE=..\..\include\wx\generic\buttonbar.h
 # End Source File\r
 # Begin Source File\r
 \r
 # 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
 # End Source File\r
 # Begin Source File\r
 \r


@@ -8372,6 +5473,14 @@ SOURCE=..\..\include\wx\generic\dragimgg.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\generic\dvrenderer.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\generic\dvrenderers.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\generic\fdrepdlg.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\generic\fdrepdlg.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8404,10 +5513,18 @@ SOURCE=..\..\include\wx\generic\gridctrl.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\generic\grideditors.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\generic\gridsel.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\generic\gridsel.h\r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\generic\headerctrlg.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\generic\helpext.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\generic\helpext.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8416,6 +5533,10 @@ SOURCE=..\..\include\wx\generic\hyperlink.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\generic\infobar.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\generic\laywin.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\generic\laywin.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8440,6 +5561,10 @@ SOURCE=..\..\include\wx\generic\notebook.h
 # End Source File\r
 # Begin Source File\r
 \r
 # 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
 SOURCE=..\..\include\wx\generic\numdlgg.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8464,6 +5589,10 @@ SOURCE=..\..\include\wx\generic\propdlg.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\generic\richmsgdlgg.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\generic\sashwin.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\generic\sashwin.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8488,11 +5617,15 @@ SOURCE=..\..\include\wx\generic\srchctlg.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\include\wx\generic\statusbr.h\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
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\include\wx\generic\tabg.h\r
+SOURCE=..\..\include\wx\generic\statusbr.h\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r


@@ -8588,6 +5721,10 @@ SOURCE=..\..\include\wx\univ\notebook.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\univ\panel.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\univ\radiobox.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\univ\radiobox.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8732,6 +5869,10 @@ SOURCE=..\..\include\wx\html\m_templ.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\html\styleparams.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\html\winpars.h\r
 # End Source File\r
 # End Group\r
 SOURCE=..\..\include\wx\html\winpars.h\r
 # End Source File\r
 # End Group\r


@@ -8752,6 +5893,18 @@ SOURCE=..\..\include\wx\access.h
 # End Source File\r
 # Begin Source File\r
 \r
 # 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\affinematrix2d.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\affinematrix2dbase.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
 SOURCE=..\..\include\wx\anidecod.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8764,6 +5917,14 @@ SOURCE=..\..\include\wx\animdecod.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\ribbon\art.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\ribbon\art_internal.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\artprov.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\artprov.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8772,10 +5933,18 @@ SOURCE=..\..\include\wx\aui\aui.h
 # End Source File\r
 # Begin Source File\r
 \r
 # 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
 \r
 SOURCE=..\..\include\wx\aui\auibook.h\r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\ribbon\bar.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\bitmap.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\bitmap.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8792,6 +5961,10 @@ SOURCE=..\..\include\wx\bookctrl.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\persist\bookctrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\brush.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\brush.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8804,6 +5977,10 @@ SOURCE=..\..\include\wx\button.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\ribbon\buttonbar.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\cairo.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\cairo.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8864,6 +6041,10 @@ SOURCE=..\..\include\wx\colour.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\colourdata.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\combo.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\combo.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8872,10 +6053,22 @@ SOURCE=..\..\include\wx\combobox.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\commandlinkbutton.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\compositewin.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\control.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\control.h\r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\ribbon\control.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\cshelp.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\cshelp.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8992,10 +6185,18 @@ SOURCE=..\..\include\wx\dragimag.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\dvrenderers.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\editlbox.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\editlbox.h\r
 # 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
 SOURCE=..\..\include\wx\effects.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9004,7 +6205,7 @@ SOURCE=..\..\include\wx\encinfo.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\include\wx\evtloop.h\r
+SOURCE=..\..\include\wx\evtloopsrc.h\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r


@@ -9020,6 +6221,10 @@ SOURCE=..\..\include\wx\filedlg.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\filehistory.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\filepicker.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\filepicker.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9036,6 +6241,10 @@ SOURCE=..\..\include\wx\font.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\fontdata.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\fontdlg.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\fontdlg.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9060,6 +6269,10 @@ SOURCE=..\..\include\wx\aui\framemanager.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\ribbon\gallery.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\gauge.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\gauge.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9096,6 +6309,14 @@ SOURCE=..\..\include\wx\grid.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\headercol.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\headerctrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\help.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\help.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9176,6 +6397,10 @@ SOURCE=..\..\include\wx\imagxpm.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\infobar.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\joystick.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\joystick.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9204,6 +6429,10 @@ SOURCE=..\..\include\wx\listctrl.h
 # End Source File\r
 # Begin Source File\r
 \r
 # 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
 SOURCE=..\..\include\wx\matrix.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9232,10 +6461,18 @@ SOURCE=..\..\include\wx\minifram.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\mousemanager.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\msgdlg.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\msgdlg.h\r
 # 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
 SOURCE=..\..\include\wx\nonownedwnd.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9244,6 +6481,10 @@ SOURCE=..\..\include\wx\notebook.h
 # End Source File\r
 # Begin Source File\r
 \r
 # 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
 SOURCE=..\..\include\wx\numdlg.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9260,6 +6501,10 @@ SOURCE=..\..\include\wx\ownerdrw.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\ribbon\page.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\palette.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\palette.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9268,6 +6513,10 @@ SOURCE=..\..\include\wx\panel.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\ribbon\panel.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\paper.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\paper.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9276,6 +6525,10 @@ SOURCE=..\..\include\wx\pen.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\persist.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\pickerbase.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\pickerbase.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9308,7 +6561,27 @@ SOURCE=..\..\include\wx\propdlg.h
 # End Source File\r
 # Begin Source File\r
 \r
 # 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
 # End Source File\r
 # Begin Source File\r
 \r


@@ -9324,10 +6597,18 @@ SOURCE=..\..\include\wx\radiobut.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\range.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\rawbmp.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\rawbmp.h\r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\rearrangectrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\region.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\region.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9336,6 +6617,10 @@ SOURCE=..\..\include\wx\renderer.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\richmsgdlg.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\richtext\richtextbuffer.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\richtext\richtextbuffer.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9352,6 +6637,10 @@ SOURCE=..\..\include\wx\richtext\richtexthtml.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\richtext\richtextimagedlg.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\richtext\richtextprint.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\richtext\richtextprint.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9368,6 +6657,10 @@ SOURCE=..\..\include\wx\richtext\richtextsymboldlg.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\richtext\richtextuicustomization.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\richtext\richtextxml.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\richtext\richtextxml.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9452,14 +6745,6 @@ SOURCE=..\..\include\wx\stc\stc.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\include\wx\tab.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\tabctrl.h\r
-# End Source File\r
-# Begin Source File\r
-\r

 SOURCE=..\..\include\wx\aui\tabmdi.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\aui\tabmdi.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9472,6 +6757,10 @@ SOURCE=..\..\include\wx\tbarbase.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\textcompleter.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\textctrl.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\textctrl.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9484,6 +6773,10 @@ SOURCE=..\..\include\wx\textentry.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\textwrapper.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\tglbtn.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\tglbtn.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9496,6 +6789,10 @@ SOURCE=..\..\include\wx\tipwin.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\ribbon\toolbar.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\toolbar.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\toolbar.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9508,6 +6805,10 @@ SOURCE=..\..\include\wx\tooltip.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\persist\toplevel.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\toplevel.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\toplevel.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9516,6 +6817,10 @@ SOURCE=..\..\include\wx\treebase.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\persist\treebook.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\treebook.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\treebook.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9524,6 +6829,10 @@ SOURCE=..\..\include\wx\treectrl.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\uiaction.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\valgen.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\valgen.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9532,6 +6841,10 @@ SOURCE=..\..\include\wx\validate.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\valnum.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\valtext.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\valtext.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9552,14 +6865,26 @@ SOURCE=..\..\include\wx\vscroll.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\persist\window.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\window.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\window.h\r
 # 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\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
 SOURCE=..\..\include\wx\wupdlock.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9616,6 +6941,10 @@ SOURCE=..\..\include\wx\xrc\xh_clrpicker.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\xrc\xh_cmdlinkbn.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\xrc\xh_collpane.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\xrc\xh_collpane.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9624,6 +6953,10 @@ SOURCE=..\..\include\wx\xrc\xh_combo.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\xrc\xh_comboctrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\xrc\xh_datectrl.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\xrc\xh_datectrl.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9636,6 +6969,14 @@ SOURCE=..\..\include\wx\xrc\xh_dlg.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\xrc\xh_editlbox.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\xrc\xh_filectrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\xrc\xh_filepicker.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\xrc\xh_filepicker.h\r
 # End Source File\r
 # Begin Source File\r


@@ -9776,6 +7117,10 @@ SOURCE=..\..\include\wx\xrc\xh_toolb.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\xrc\xh_toolbk.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\xrc\xh_tree.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\xrc\xh_tree.h\r
 # End Source File\r
 # Begin Source File\r