add missing headers for PCH-less build

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

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 2fc125305aca4becc62037ab924dd127ace12616..3701568184342d2fe508fe0b7b9299abb54454df 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,20 +35,20 @@ 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 CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r

 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r


@@ -65,10 +57,10 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r

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

 \r
 \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,8 +72,8 @@ 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 CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r

 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r


@@ -90,73 +82,23 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r

-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug\r
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivdll\core"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswunivdll\core"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_core.lib"\r
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_core.lib"\r
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r

 \r
 \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 "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290d_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290d_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290d_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_core.lib" /debug\r
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_core.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r

 # PROP BASE Intermediate_Dir "vc_mswudll\core"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP 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 CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r

 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r


@@ -165,10 +107,10 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r

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

 \r
 \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,8 +122,8 @@ 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 CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r

 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r


@@ -190,73 +132,23 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r

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

 \r
 \r

-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswdll\core"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswdll\core"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw290_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw290_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_core.lib"\r
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_core.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r

 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r

-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswddll\core"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswddll\core"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290d_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290d_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290d_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290d_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_core.lib" /debug\r
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_core.lib" /debug\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r

 # PROP BASE Output_Dir "..\..\lib\vc_lib"\r
 # PROP BASE Intermediate_Dir "vc_mswunivu\core"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP 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 /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r

 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
 # 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 "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r

 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
 # 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 "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29_core.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29_core.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r

 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
 # PROP BASE Output_Dir "..\..\lib\vc_lib"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
 # PROP BASE Output_Dir "..\..\lib\vc_lib"\r

-# PROP BASE Intermediate_Dir "vc_mswunivd\core"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswunivd\core"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29d_core.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29d_core.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r

 # PROP BASE Intermediate_Dir "vc_mswu\core"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP 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 /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r

 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
 # 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 "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r

 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
 # 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 "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29_core.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29_core.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswd\core"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswd\core"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29d_core.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29d_core.lib"\r
-\r

 !ENDIF\r
 \r
 # Begin Target\r
 \r
 !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


@@ -666,6 +458,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


@@ -782,6 +582,10 @@ SOURCE=..\..\src\common\radiocmn.cpp
 # End Source File\r
 # Begin Source File\r
 \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


@@ -798,6 +602,10 @@ 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\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


@@ -822,6 +630,10 @@ SOURCE=..\..\src\common\textcmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

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

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


@@ -850,6 +662,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


@@ -860,55 +680,62 @@ 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
+!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
+# PROP Exclude_From_Build 1\r

 \r
 \r

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

 \r
 \r

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

 \r
 \r

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

 \r
 \r

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

 \r
 \r

+!ENDIF\r

 \r
 \r

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

 \r
 \r

+SOURCE=..\..\src\msw\ole\access.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


@@ -921,57 +748,68 @@ SOURCE=..\..\src\msw\accel.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\ole\access.cpp\r
+SOURCE=..\..\src\msw\ole\activex.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\app.cpp\r
+# End Source File\r
+# Begin Source File\r

 \r
 \r

+SOURCE=..\..\src\msw\artmsw.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


@@ -984,10 +822,6 @@ 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
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\msw\ole\automtn.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -998,15 +832,7 @@ SOURCE=..\..\src\msw\bitmap.cpp
 \r
 SOURCE=..\..\src\msw\bmpbuttn.cpp\r
 \r
 \r
 SOURCE=..\..\src\msw\bmpbuttn.cpp\r
 \r

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

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


@@ -1014,26 +840,12 @@ SOURCE=..\..\src\msw\bmpbuttn.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


@@ -1042,12 +854,6 @@ SOURCE=..\..\src\msw\bmpbuttn.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


@@ -1065,15 +871,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


@@ -1081,26 +879,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


@@ -1109,12 +893,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


@@ -1132,42 +910,20 @@ 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
+!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
-\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 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


@@ -1176,12 +932,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


@@ -1195,15 +945,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


@@ -1211,26 +953,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


@@ -1239,12 +967,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


@@ -1258,15 +980,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


@@ -1274,26 +988,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


@@ -1302,12 +1002,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


@@ -1325,15 +1019,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


@@ -1341,26 +1027,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


@@ -1369,12 +1041,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


@@ -1392,15 +1058,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


@@ -1408,26 +1066,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


@@ -1436,12 +1080,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


@@ -1455,15 +1093,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


@@ -1471,26 +1101,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


@@ -1499,12 +1115,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


@@ -1518,15 +1128,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


@@ -1534,26 +1136,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


@@ -1562,12 +1150,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


@@ -1613,15 +1195,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


@@ -1629,26 +1203,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


@@ -1657,12 +1217,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


@@ -1684,15 +1238,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


@@ -1700,26 +1246,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


@@ -1728,12 +1260,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


@@ -1751,15 +1277,7 @@ 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
-\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


@@ -1767,26 +1285,12 @@ 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 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


@@ -1795,12 +1299,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


@@ -1830,15 +1328,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


@@ -1846,26 +1336,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


@@ -1874,12 +1350,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


@@ -1893,15 +1363,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


@@ -1909,26 +1371,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


@@ -1937,12 +1385,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


@@ -1960,15 +1402,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


@@ -1976,41 +1410,21 @@ 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
+!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 Universal Unicode 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 Universal Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r

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


@@ -2031,15 +1445,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


@@ -2047,26 +1453,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


@@ -2075,12 +1467,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


@@ -2092,17 +1478,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
+SOURCE=..\..\src\msw\gauge.cpp\r

 \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


@@ -2110,26 +1488,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


@@ -2138,12 +1502,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


@@ -2171,7 +1529,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


@@ -2193,15 +1582,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


@@ -2209,26 +1590,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


@@ -2237,12 +1604,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


@@ -2256,15 +1617,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


@@ -2272,26 +1625,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


@@ -2300,12 +1639,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


@@ -2319,15 +1652,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


@@ -2335,26 +1660,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


@@ -2363,12 +1674,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


@@ -2386,15 +1691,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


@@ -2402,26 +1699,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


@@ -2430,12 +1713,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


@@ -2449,15 +1726,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


@@ -2465,26 +1734,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


@@ -2493,12 +1748,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


@@ -2512,15 +1761,7 @@ 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
-\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


@@ -2528,26 +1769,12 @@ 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 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


@@ -2556,12 +1783,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


@@ -2575,15 +1796,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


@@ -2591,26 +1804,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


@@ -2619,12 +1818,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


@@ -2642,15 +1835,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


@@ -2658,26 +1843,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


@@ -2686,12 +1857,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


@@ -2709,15 +1874,7 @@ 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
-\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


@@ -2725,41 +1882,21 @@ SOURCE=..\..\src\msw\nativdlg.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
+!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 Universal Unicode 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 Universal Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r

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


@@ -2770,57 +1907,64 @@ SOURCE=..\..\src\msw\nativdlg.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\notebook.cpp\r
+SOURCE=..\..\src\msw\nativewin.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\notebook.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


@@ -2839,15 +1983,7 @@ 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
-\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


@@ -2855,26 +1991,12 @@ SOURCE=..\..\src\msw\ownerdrw.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


@@ -2883,12 +2005,6 @@ SOURCE=..\..\src\msw\ownerdrw.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


@@ -2922,15 +2038,7 @@ SOURCE=..\..\src\msw\printwin.cpp
 \r
 SOURCE=..\..\src\msw\radiobox.cpp\r
 \r
 \r
 SOURCE=..\..\src\msw\radiobox.cpp\r
 \r

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

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


@@ -2938,26 +2046,12 @@ SOURCE=..\..\src\msw\radiobox.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


@@ -2966,12 +2060,6 @@ SOURCE=..\..\src\msw\radiobox.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


@@ -2985,15 +2073,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


@@ -3001,26 +2081,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


@@ -3029,12 +2095,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


@@ -3056,15 +2116,7 @@ SOURCE=..\..\src\msw\renderer.cpp
 \r
 SOURCE=..\..\src\msw\scrolbar.cpp\r
 \r
 \r
 SOURCE=..\..\src\msw\scrolbar.cpp\r
 \r

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

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


@@ -3072,26 +2124,12 @@ SOURCE=..\..\src\msw\scrolbar.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


@@ -3100,12 +2138,6 @@ SOURCE=..\..\src\msw\scrolbar.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


@@ -3121,17 +2153,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


@@ -3139,26 +2163,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


@@ -3167,12 +2177,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


@@ -3186,15 +2190,7 @@ 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
-\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


@@ -3202,26 +2198,12 @@ SOURCE=..\..\src\msw\spinbutt.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


@@ -3230,12 +2212,6 @@ SOURCE=..\..\src\msw\spinbutt.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


@@ -3249,15 +2225,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


@@ -3265,26 +2233,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


@@ -3293,12 +2247,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


@@ -3312,15 +2260,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


@@ -3328,26 +2268,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


@@ -3356,12 +2282,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


@@ -3375,15 +2295,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


@@ -3391,26 +2303,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


@@ -3419,12 +2317,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


@@ -3436,57 +2328,64 @@ 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
+SOURCE=..\..\src\msw\statline.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
+# PROP Exclude_From_Build 1\r

 \r
 \r

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

 \r
 \r

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

 \r
 \r

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

 \r
 \r

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

 \r
 \r

+!ENDIF\r

 \r
 \r

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

 \r
 \r

+SOURCE=..\..\src\msw\stattext.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


@@ -3499,107 +2398,22 @@ 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
+SOURCE=..\..\src\msw\statusbar.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
-\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
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\msw\stattext.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\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
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r

 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \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


@@ -3608,12 +2422,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


@@ -3625,17 +2433,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


@@ -3643,26 +2443,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


@@ -3671,12 +2457,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


@@ -3688,17 +2468,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


@@ -3706,26 +2478,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


@@ -3734,12 +2492,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


@@ -3751,17 +2503,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


@@ -3769,26 +2513,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


@@ -3797,12 +2527,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


@@ -3814,17 +2538,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\tglbtn.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\toolbar.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


@@ -3832,26 +2548,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


@@ -3860,12 +2562,6 @@ 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
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 \r


@@ -3887,15 +2583,7 @@ SOURCE=..\..\src\msw\toplevel.cpp
 \r
 SOURCE=..\..\src\msw\treectrl.cpp\r
 \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
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r

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


@@ -3903,26 +2591,12 @@ SOURCE=..\..\src\msw\treectrl.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


@@ -3931,12 +2605,6 @@ SOURCE=..\..\src\msw\treectrl.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


@@ -3962,38 +2630,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


@@ -4002,14 +2650,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


@@ -4037,26 +2677,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


@@ -4065,26 +2691,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


@@ -4124,26 +2736,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


@@ -4152,26 +2750,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


@@ -4199,26 +2783,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


@@ -4227,31 +2797,17 @@ 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
+!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 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
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r

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


@@ -4266,26 +2822,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


@@ -4294,26 +2836,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


@@ -4333,26 +2861,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


@@ -4361,26 +2875,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


@@ -4400,26 +2900,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


@@ -4428,26 +2914,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


@@ -4465,32 +2937,22 @@ 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\headerctrlg.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

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


@@ -4499,26 +2961,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


@@ -4538,26 +2986,12 @@ SOURCE=..\..\src\generic\logg.cpp
 \r
 SOURCE=..\..\src\generic\mdig.cpp\r
 \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
-\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 +3000,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


@@ -4601,26 +3021,12 @@ SOURCE=..\..\src\generic\mdig.cpp
 \r
 SOURCE=..\..\src\generic\msgdlgg.cpp\r
 \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
+!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


@@ -4629,26 +3035,12 @@ SOURCE=..\..\src\generic\msgdlgg.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


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

 \r
 \r

+SOURCE=..\..\src\generic\statusbr.cpp\r

 \r
 \r

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

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

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

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


@@ -4866,26 +3175,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


@@ -4894,26 +3189,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


@@ -4929,26 +3210,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


@@ -4957,88 +3224,11 @@ 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 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\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
-\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
+!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


@@ -5053,28 +3243,14 @@ SOURCE=..\..\src\univ\checkbox.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\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
+SOURCE=..\..\src\univ\checkbox.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


@@ -5083,26 +3259,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


@@ -5116,28 +3278,14 @@ SOURCE=..\..\src\univ\checklst.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\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
+SOURCE=..\..\src\univ\checklst.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


@@ -5146,26 +3294,12 @@ SOURCE=..\..\src\univ\choice.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


@@ -5179,28 +3313,14 @@ SOURCE=..\..\src\univ\choice.cpp
 # End Source File\r
 # Begin Source File\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
+SOURCE=..\..\src\univ\choice.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


@@ -5209,26 +3329,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


@@ -5244,26 +3350,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


@@ -5272,26 +3364,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


@@ -5307,26 +3385,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


@@ -5335,26 +3399,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


@@ -5370,26 +3420,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


@@ -5398,26 +3434,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


@@ -5433,26 +3455,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


@@ -5461,26 +3469,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


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


@@ -5524,26 +3504,12 @@ SOURCE=..\..\src\univ\framuniv.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


@@ -5559,26 +3525,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


@@ -5587,26 +3539,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


@@ -5622,26 +3560,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


@@ -5650,26 +3574,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


@@ -5685,26 +3595,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


@@ -5713,26 +3609,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


@@ -5748,26 +3630,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


@@ -5776,26 +3644,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


@@ -5811,25 +3665,11 @@ 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
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\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


@@ -5839,26 +3679,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


@@ -5874,26 +3700,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


@@ -5902,26 +3714,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


@@ -5937,26 +3735,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


@@ -5965,26 +3749,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


@@ -6000,26 +3770,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


@@ -6028,26 +3784,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


@@ -6063,26 +3805,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


@@ -6091,26 +3819,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


@@ -6126,26 +3840,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


@@ -6154,26 +3854,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


@@ -6189,26 +3875,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


@@ -6217,26 +3889,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


@@ -6252,26 +3910,12 @@ 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
-\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


@@ -6280,26 +3924,12 @@ SOURCE=..\..\src\univ\scrarrow.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


@@ -6315,26 +3945,12 @@ SOURCE=..\..\src\univ\scrarrow.cpp
 \r
 SOURCE=..\..\src\univ\scrolbar.cpp\r
 \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
-\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


@@ -6343,26 +3959,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


@@ -6378,54 +3980,61 @@ SOURCE=..\..\src\univ\scrolbar.cpp
 \r
 SOURCE=..\..\src\univ\scrthumb.cpp\r
 \r
 \r
 SOURCE=..\..\src\univ\scrthumb.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
-\r
+!ENDIF\r

 \r
 \r

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

 \r
 \r

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

 \r
 \r

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

 \r
 \r
 \r
 \r

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

 \r
 \r
 \r
 \r

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


@@ -6441,26 +4050,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


@@ -6469,26 +4064,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


@@ -6504,26 +4085,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


@@ -6532,26 +4099,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


@@ -6567,26 +4120,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


@@ -6595,26 +4134,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


@@ -6630,26 +4155,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


@@ -6658,26 +4169,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


@@ -6693,26 +4190,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


@@ -6721,26 +4204,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


@@ -6756,26 +4225,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


@@ -6784,26 +4239,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


@@ -6819,26 +4260,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


@@ -6847,26 +4274,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


@@ -6882,26 +4295,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


@@ -6910,26 +4309,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


@@ -6945,26 +4330,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


@@ -6973,26 +4344,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


@@ -7008,26 +4365,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


@@ -7036,26 +4379,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


@@ -7071,26 +4400,12 @@ SOURCE=..\..\src\univ\tglbtn.cpp
 \r
 SOURCE=..\..\src\univ\theme.cpp\r
 \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
+!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


@@ -7099,26 +4414,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


@@ -7134,26 +4435,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


@@ -7162,26 +4449,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


@@ -7197,26 +4470,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


@@ -7225,26 +4484,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


@@ -7260,26 +4505,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


@@ -7288,26 +4519,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


@@ -7323,26 +4540,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


@@ -7351,26 +4554,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


@@ -7388,21 +4577,9 @@ SOURCE=..\..\src\univ\winuniv.cpp
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\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
+SOURCE=..\..\include\wx\msw\setup.h\r

 \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


@@ -7414,7 +4591,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


@@ -7424,7 +4601,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


@@ -7434,38 +4611,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


@@ -7478,7 +4623,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


@@ -7488,7 +4633,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


@@ -7498,26 +4643,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


@@ -7525,7 +4650,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


@@ -7535,7 +4660,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


@@ -7545,38 +4670,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


@@ -7589,7 +4682,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


@@ -7599,7 +4692,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


@@ -7609,38 +4702,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


@@ -7690,6 +4751,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


@@ -7698,6 +4763,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


@@ -7758,6 +4827,10 @@ SOURCE=..\..\include\wx\msw\ole\dataobj2.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

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

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


@@ -7834,7 +4907,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


@@ -7844,7 +4917,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


@@ -7854,7 +4927,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


@@ -7864,27 +4937,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


@@ -7894,7 +4947,7 @@ 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
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r

 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r


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

 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r


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


@@ -7944,27 +4977,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.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\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
-\r
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h\r
-InputPath=..\..\include\wx\msw\genrcdefs.h\r
-\r
-"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"\r
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"\r
-\r
-# End Custom Build\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r

 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r


@@ -7974,7 +4987,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


@@ -7984,26 +4997,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


@@ -8013,6 +5006,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


@@ -8089,6 +5086,10 @@ 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
 SOURCE=..\..\include\wx\msw\ole\oleutils.h\r
 # End Source File\r
 # Begin Source File\r


@@ -8137,7 +5138,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


@@ -8161,10 +5162,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


@@ -8173,7 +5170,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


@@ -8181,11 +5178,11 @@ 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
+SOURCE=..\..\include\wx\msw\textctrl.h\r

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

-SOURCE=..\..\include\wx\msw\textctrl.h\r
+SOURCE=..\..\include\wx\msw\textentry.h\r

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


@@ -8193,6 +5190,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


@@ -8249,7 +5250,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


@@ -8333,10 +5334,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


@@ -8369,6 +5378,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


@@ -8417,11 +5430,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


@@ -8681,6 +5698,10 @@ 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\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


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


@@ -8833,10 +5858,6 @@ SOURCE=..\..\include\wx\dateevt.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

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

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


@@ -8929,6 +5950,10 @@ SOURCE=..\..\include\wx\editlbox.h
 # End Source File\r
 # Begin Source File\r
 \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


@@ -9029,6 +6054,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


@@ -9137,6 +6170,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


@@ -9169,6 +6206,10 @@ SOURCE=..\..\include\wx\msgdlg.h
 # End Source File\r
 # Begin Source File\r
 \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


@@ -9177,6 +6218,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


@@ -9241,7 +6286,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


@@ -9261,6 +6326,10 @@ SOURCE=..\..\include\wx\rawbmp.h
 # End Source File\r
 # Begin Source File\r
 \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


@@ -9385,14 +6454,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


@@ -9413,6 +6474,10 @@ SOURCE=..\..\include\wx\textdlg.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

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

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


@@ -9485,10 +6550,18 @@ SOURCE=..\..\include\wx\window.h
 # End Source File\r
 # Begin Source File\r
 \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


@@ -9553,6 +6626,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