Added wxRenderer method for drawing selection

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

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 086ac2727d51f279074c3c00ed274b367437c11b..5ef1ee2619fd935c2362984f1863a89391bc3223 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -1,11 +1,11 @@
-# Microsoft Developer Studio Project File - Name="core" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="wx_core" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=core - Win32 DLL Release
+CFG=core - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -14,26 +14,26 @@ CFG=core - Win32 DLL Release
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "wx_core.mak" CFG="core - Win32 DLL Release"
+!MESSAGE NMAKE /f "wx_core.mak" CFG="core - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "core - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "core - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Universal Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Universal Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Universal Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Unicode Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -43,189 +43,180 @@ CFG=core - Win32 DLL Release
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "core - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswd\core"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswd\core"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25d_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25d_core.lib"
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_msw\core"
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\core"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\core"
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivudll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /Fd..\..\lib\vc_lib\wxmsw25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /Fd..\..\lib\vc_lib\wxmsw25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# 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\wxmswuniv270u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# 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\wxmswuniv270u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv270u_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25_core.lib"
+LINK32=link.exe
+# 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\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_core.lib"
+# 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\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27u_core.lib"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\core"
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\core"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\core"
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivuddll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# 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\wxmswuniv270ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# 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\wxmswuniv270ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv270ud_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25ud_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25ud_core.lib"
+LINK32=link.exe
+# 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\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_core.lib" /debug
+# 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\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27ud_core.lib" /debug
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\core"
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivdll\core"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\core"
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivdll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /Fd..\..\lib\vc_lib\wxmsw25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /Fd..\..\lib\vc_lib\wxmsw25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# 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\wxmswuniv270_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# 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\wxmswuniv270_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv270_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25u_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25u_core.lib"
+LINK32=link.exe
+# 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\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_core.lib"
+# 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\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27_core.lib"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivd\core"
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswunivddll\core"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\core"
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswunivddll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# 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\wxmswuniv270d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# 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\wxmswuniv270d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv270d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25d_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25d_core.lib"
+LINK32=link.exe
+# 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\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_core.lib" /debug
+# 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\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv27d_core.lib" /debug
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\core"
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\core"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswuniv\core"
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /Fd..\..\lib\vc_lib\wxmswuniv25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /Fd..\..\lib\vc_lib\wxmswuniv25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# 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\wxmsw270u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# 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\wxmsw270u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw270u_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25_core.lib"
+LINK32=link.exe
+# 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\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_core.lib"
+# 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\wxbase27u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27u_core.lib"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivud\core"
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\core"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\core"
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# 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\wxmsw270ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# 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\wxmsw270ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw270ud_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25ud_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25ud_core.lib"
+LINK32=link.exe
+# 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\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_core.lib" /debug
+# 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\wxbase27ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27ud_core.lib" /debug
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\core"
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswdll\core"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\core"
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswdll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /Fd..\..\lib\vc_lib\wxmswuniv25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /Fd..\..\lib\vc_lib\wxmswuniv25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# 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\wxmsw270_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# 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\wxmsw270_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw270_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25u_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25u_core.lib"
+LINK32=link.exe
+# 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\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_core.lib"
+# 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\wxbase27.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27_core.lib"
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
@@ -239,214 +230,223 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswddll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw251d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw251d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# 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\wxmsw270d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# 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\wxmsw270d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# 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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_core.lib" /debug
-# 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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_core.lib" /debug
+# 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\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_core.lib" /debug
+# 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\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_core.lib" /debug
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswdll\core"
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivu\core"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\core"
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw251_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw251_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
-# 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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_core.lib"
-# 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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_core.lib"
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27u_core.lib"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\core"
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivud\core"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\core"
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivud\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw251ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw251ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
-# 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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_core.lib" /debug
-# 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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_core.lib" /debug
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_core.lib"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\core"
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswuniv\core"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\core"
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswuniv\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw251u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw251u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
-# 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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_core.lib"
-# 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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw251u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_core.lib"
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27_core.lib"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivddll\core"
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswunivd\core"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\core"
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivd\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv251d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv251d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv27d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
-# 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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_core.lib" /debug
-# 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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_core.lib" /debug
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27d_core.lib"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivdll\core"
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\core"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\core"
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv251_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv251_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
-# 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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_core.lib"
-# 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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_core.lib"
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27u_core.lib"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\core"
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\core"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\core"
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv251ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /GR /GX /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv251ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
-# 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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_core.lib" /debug
-# 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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_core.lib" /debug
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27ud_core.lib"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\core"
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_msw\core"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\core"
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_msw\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv251u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /GR /GX /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv251u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw27_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
-# 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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_core.lib"
-# 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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv251u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_core.lib"
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_core.lib"
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_core.lib"
 
 !ENDIF
 
 # Begin Target
 
-# Name "core - Win32 Debug"
-# Name "core - Win32 Release"
-# Name "core - Win32 Unicode Debug"
-# Name "core - Win32 Unicode Release"
-# Name "core - Win32 Universal Debug"
-# Name "core - Win32 Universal Release"
-# Name "core - Win32 Universal Unicode Debug"
-# Name "core - Win32 Universal Unicode Release"
-# Name "core - Win32 DLL Debug"
-# Name "core - Win32 DLL Release"
-# Name "core - Win32 DLL Unicode Debug"
-# Name "core - Win32 DLL Unicode Release"
-# Name "core - Win32 DLL Universal Debug"
-# Name "core - Win32 DLL Universal Release"
-# Name "core - Win32 DLL Universal Unicode Debug"
 # Name "core - Win32 DLL Universal Unicode Release"
+# Name "core - Win32 DLL Universal Unicode Debug"
+# Name "core - Win32 DLL Universal Release"
+# Name "core - Win32 DLL Universal Debug"
+# Name "core - Win32 DLL Unicode Release"
+# Name "core - Win32 DLL Unicode Debug"
+# Name "core - Win32 DLL Release"
+# Name "core - Win32 DLL Debug"
+# Name "core - Win32 Universal Unicode Release"
+# Name "core - Win32 Universal Unicode Debug"
+# Name "core - Win32 Universal Release"
+# Name "core - Win32 Universal Debug"
+# Name "core - Win32 Unicode Release"
+# Name "core - Win32 Unicode Debug"
+# Name "core - Win32 Release"
+# Name "core - Win32 Debug"
 # Begin Group "Common Sources"
 
 # PROP Default_Filter ""
@@ -492,6 +492,10 @@ SOURCE=..\..\src\common\cmndata.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\colourcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\containr.cpp
 # End Source File
 # Begin Source File
@@ -552,6 +556,10 @@ SOURCE=..\..\src\common\event.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\evtloopcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\fddlgcmn.cpp
 # End Source File
 # Begin Source File
@@ -580,6 +588,10 @@ SOURCE=..\..\src\common\gaugecmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\gbsizer.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\gdicmn.cpp
 # End Source File
 # Begin Source File
@@ -712,6 +724,10 @@ SOURCE=..\..\src\common\statbar.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\stockitem.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\tbarbase.cpp
 # End Source File
 # Begin Source File
@@ -762,125 +778,125 @@ SOURCE=..\..\src\common\xpmdecod.cpp
 
 SOURCE=..\..\src\msw\accel.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\ole\access.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
+
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\ole\access.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+
 !ENDIF
 
 # End Source File
@@ -900,519 +916,519 @@ SOURCE=..\..\src\msw\bitmap.cpp
 
 SOURCE=..\..\src\msw\bmpbuttn.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\brush.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-SOURCE=..\..\src\msw\button.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+SOURCE=..\..\src\msw\brush.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\button.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\caret.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-SOURCE=..\..\src\msw\checkbox.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+SOURCE=..\..\src\msw\caret.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\checkbox.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\checklst.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
-
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\checklst.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+# PROP Exclude_From_Build 1
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\choice.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\choice.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\clipbrd.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-SOURCE=..\..\src\msw\colordlg.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+SOURCE=..\..\src\msw\clipbrd.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\colordlg.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\colour.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-SOURCE=..\..\src\msw\combobox.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+SOURCE=..\..\src\msw\colour.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\combobox.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\control.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\control.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+
 !ENDIF
 
 # End Source File
@@ -1452,19 +1468,39 @@ SOURCE=..\..\src\msw\dcscreen.cpp
 
 SOURCE=..\..\src\msw\dialog.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -1472,56 +1508,95 @@ SOURCE=..\..\src\msw\dialog.cpp
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\dialup.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\dib.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\dirdlg.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-SOURCE=..\..\src\msw\dialup.cpp
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\dib.cpp
-# End Source File
-# Begin Source File
+!ENDIF
 
-SOURCE=..\..\src\msw\dirdlg.cpp
 # End Source File
 # Begin Source File
 
@@ -1531,61 +1606,61 @@ SOURCE=..\..\src\msw\display.cpp
 
 SOURCE=..\..\src\msw\dragimag.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
@@ -1616,192 +1691,192 @@ SOURCE=..\..\src\msw\evtloop.cpp
 
 SOURCE=..\..\src\msw\fdrepdlg.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\filedlg.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
+
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\filedlg.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\font.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-SOURCE=..\..\src\msw\fontdlg.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+SOURCE=..\..\src\msw\font.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\fontdlg.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+
 !ENDIF
 
 # End Source File
@@ -1817,124 +1892,124 @@ SOURCE=..\..\src\msw\fontutil.cpp
 
 SOURCE=..\..\src\msw\frame.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\gauge95.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\gauge95.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
@@ -1949,8 +2024,7 @@ SOURCE=..\..\src\msw\gdiobj.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\gsockmsw.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=..\..\src\msw\gsockmsw.cpp
 # End Source File
 # Begin Source File
 
@@ -1968,771 +2042,771 @@ SOURCE=..\..\src\msw\icon.cpp
 
 SOURCE=..\..\src\msw\imaglist.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\iniconf.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\iniconf.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\listbox.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\listbox.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\listctrl.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\listctrl.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\main.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-SOURCE=..\..\src\msw\mdi.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+SOURCE=..\..\src\msw\main.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\mdi.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\menu.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
+
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\menu.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\menuitem.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
+
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\menuitem.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\metafile.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
+
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\metafile.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\minifram.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-SOURCE=..\..\src\msw\msgdlg.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+SOURCE=..\..\src\msw\minifram.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\msgdlg.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\mslu.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-SOURCE=..\..\src\msw\nativdlg.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+SOURCE=..\..\src\msw\mslu.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\nativdlg.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\notebook.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
+
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\notebook.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\ole\oleutils.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-SOURCE=..\..\src\msw\ownerdrw.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+SOURCE=..\..\src\msw\ole\oleutils.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\ownerdrw.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+
 !ENDIF
 
 # End Source File
@@ -2758,1047 +2832,1110 @@ SOURCE=..\..\src\msw\printwin.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\radiobox.cpp
+SOURCE=..\..\src\msw\radiobox.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\radiobut.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\radiobut.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\region.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\renderer.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+SOURCE=..\..\src\msw\scrolbar.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-SOURCE=..\..\src\msw\region.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1
 
-SOURCE=..\..\src\msw\renderer.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\scrolbar.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\settings.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\slider95.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1
 
-SOURCE=..\..\src\msw\settings.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\slider95.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\spinbutt.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\spinbutt.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\spinctrl.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\spinctrl.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\statbmp.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\statbmp.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\statbox.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\statbox.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\statbr95.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\statbr95.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\statline.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\statline.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\stattext.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\stattext.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\tabctrl.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\tabctrl.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\tbar95.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\tbar95.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\textctrl.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\textctrl.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\tglbtn.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-SOURCE=..\..\src\msw\tglbtn.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+SOURCE=..\..\src\msw\timer.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\tooltip.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+SOURCE=..\..\src\msw\toplevel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\treectrl.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\timer.cpp
+SOURCE=..\..\src\msw\utilsgui.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\tooltip.cpp
+SOURCE=..\..\src\msw\ole\uuid.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\toplevel.cpp
+SOURCE=..\..\src\msw\uxtheme.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\treectrl.cpp
-
-!IF  "$(CFG)" == "core - Win32 Debug"
+SOURCE=..\..\src\msw\version.rc
 
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-SOURCE=..\..\src\msw\utilsgui.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1
 
-SOURCE=..\..\src\msw\ole\uuid.cpp
-# End Source File
-# Begin Source File
+!ENDIF
 
-SOURCE=..\..\src\msw\uxtheme.cpp
 # End Source File
 # Begin Source File
 
@@ -3816,61 +3953,61 @@ SOURCE=..\..\src\msw\window.cpp
 
 SOURCE=..\..\src\generic\accel.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
+# PROP Exclude_From_Build 1
 
 !ENDIF
 
@@ -3881,67 +4018,71 @@ SOURCE=..\..\src\generic\busyinfo.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\generic\choicbkg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\choicdgg.cpp
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\src\generic\colrdlgg.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
+# PROP Exclude_From_Build 1
 
 !ENDIF
 
@@ -3958,514 +4099,514 @@ SOURCE=..\..\src\generic\dirctrlg.cpp
 
 SOURCE=..\..\src\generic\dirdlgg.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\generic\dragimgg.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\fdrepdlg.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\generic\dragimgg.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\generic\fdrepdlg.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\generic\filedlgg.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\generic\filedlgg.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\generic\fontdlgg.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\generic\fontdlgg.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\generic\imaglist.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\generic\imaglist.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\generic\listbkg.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\listctrl.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\generic\listbkg.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\generic\listctrl.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\generic\logg.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\mdig.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\generic\logg.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\generic\mdig.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\generic\msgdlgg.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\generic\msgdlgg.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
+# PROP Exclude_From_Build 1
 
 !ENDIF
 
@@ -4514,61 +4655,61 @@ SOURCE=..\..\src\generic\splitter.cpp
 
 SOURCE=..\..\src\generic\statusbr.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
@@ -4577,61 +4718,61 @@ SOURCE=..\..\src\generic\statusbr.cpp
 
 SOURCE=..\..\src\generic\tabg.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
+# PROP Exclude_From_Build 1
 
 !ENDIF
 
@@ -4646,6 +4787,14 @@ SOURCE=..\..\src\generic\tipwin.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\generic\toolbkg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\treebkg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\treectlg.cpp
 # End Source File
 # Begin Source File
@@ -4664,2348 +4813,2446 @@ SOURCE=..\..\src\generic\vscroll.cpp
 
 SOURCE=..\..\src\univ\bmpbuttn.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\button.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\button.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\univ\checkbox.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+
+
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
+# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\checkbox.cpp
+SOURCE=..\..\src\univ\checklst.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\choice.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\checklst.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\colschem.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\choice.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\combobox.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\colschem.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\control.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\combobox.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\ctrlrend.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\control.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\dialog.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\ctrlrend.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\framuniv.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\dialog.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\gauge.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\framuniv.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\themes\gtk.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\gauge.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\inpcons.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\themes\gtk.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\inphand.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\inpcons.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\listbox.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\inphand.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\menu.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\listbox.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\themes\metal.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\menu.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
+
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\univ\notebook.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
-
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\themes\metal.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\radiobox.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\notebook.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\radiobut.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\radiobox.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\scrarrow.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\radiobut.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\scrolbar.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\scrarrow.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\scrthumb.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\scrolbar.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\slider.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\scrthumb.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\univ\spinbutt.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
-
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\slider.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\statbmp.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\spinbutt.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\statbox.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\statbmp.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\statline.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\statbox.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\stattext.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\statline.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\statusbr.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\stattext.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\textctrl.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\statusbr.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\theme.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\textctrl.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\toolbar.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\theme.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\topluniv.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\toolbar.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\themes\win32.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\topluniv.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\univ\winuniv.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-SOURCE=..\..\src\univ\themes\win32.cpp
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ENDIF
 
+# End Source File
+# End Group
+# Begin Group "Setup Headers"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+# PROP Default_Filter ""
+# Begin Source File
 
+SOURCE=..\..\include\wx\msw\setup.h
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# Begin Custom Build - 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+# End Custom Build
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ENDIF
+# Begin Custom Build - 
 
-# End Source File
-# Begin Source File
+# End Custom Build
 
-SOURCE=..\..\src\univ\winuniv.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+# Begin Custom Build - 
 
-# PROP Exclude_From_Build 1
+# End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-# PROP Exclude_From_Build 1
+# Begin Custom Build - 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+# End Custom Build
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
 
-# PROP Exclude_From_Build 1
+"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+# End Custom Build
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
 
+"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+# End Custom Build
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
 
+# End Custom Build
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
 
-# PROP Exclude_From_Build 1
+# End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
+# Begin Custom Build - 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+# End Custom Build
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+# Begin Custom Build - 
 
+# End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
+# Begin Custom Build - 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+# End Custom Build
 
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+# Begin Custom Build - 
 
+# End Custom Build
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# End Source File
-# End Group
-# Begin Group "Setup Headers"
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
 
-# PROP Default_Filter ""
-# Begin Source File
+"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
 
-SOURCE=..\..\include\wx\msw\setup.h
+# End Custom Build
 
-!IF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
 
 # End Custom Build
 
@@ -7019,143 +7266,148 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
+"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+!ENDIF
 
-"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
+# End Source File
+# Begin Source File
 
-# End Custom Build
+SOURCE=..\..\include\wx\univ\setup.h
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
 
-"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
 
-"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
+"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
 
-"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
+"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
 
-"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+# Begin Custom Build - 
 
-"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+
+# Begin Custom Build - 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+# Begin Custom Build - 
 
-"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+# Begin Custom Build - 
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
 
-"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
+"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
 
-"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
 
-"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
+"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\include\wx\univ\setup.h
 
-"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+# Begin Custom Build - 
 
-"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+# Begin Custom Build - 
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+# Begin Custom Build - 
 
-"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+# Begin Custom Build - 
 
 # End Custom Build
 
@@ -7176,6 +7428,10 @@ SOURCE=..\..\include\wx\msw\ole\access.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\msw\ole\activex.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\msw\app.h
 # End Source File
 # Begin Source File
@@ -7252,6 +7508,10 @@ SOURCE=..\..\include\wx\msw\ole\dataobj2.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\msw\datectrl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\msw\dc.h
 # End Source File
 # Begin Source File
@@ -7300,35 +7560,186 @@ SOURCE=..\..\include\wx\msw\enhmeta.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\fdrepdlg.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\include\wx\msw\evtloop.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\fdrepdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\filedlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\font.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\fontdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\frame.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\gauge95.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\gdiimage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\genrcdefs.h
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
 
-SOURCE=..\..\include\wx\msw\filedlg.h
-# End Source File
-# Begin Source File
+# End Custom Build
 
-SOURCE=..\..\include\wx\msw\font.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-SOURCE=..\..\include\wx\msw\fontdlg.h
-# End Source File
-# Begin Source File
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 
-SOURCE=..\..\include\wx\msw\frame.h
-# End Source File
-# Begin Source File
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
 
-SOURCE=..\..\include\wx\msw\gauge95.h
-# End Source File
-# Begin Source File
+# End Custom Build
 
-SOURCE=..\..\include\wx\msw\gdiimage.h
-# End Source File
-# Begin Source File
+!ENDIF
 
-SOURCE=..\..\include\wx\msw\gdiobj.h
 # End Source File
 # Begin Source File
 
@@ -7348,6 +7759,10 @@ SOURCE=..\..\include\wx\msw\helpwin.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\msw\htmlhelp.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\msw\icon.h
 # End Source File
 # Begin Source File
@@ -7400,10 +7815,6 @@ SOURCE=..\..\include\wx\msw\msgdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\mslu.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\msw\msvcrt.h
 # End Source File
 # Begin Source File
@@ -7424,15 +7835,15 @@ SOURCE=..\..\include\wx\msw\pen.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\printdlg.h
+SOURCE=..\..\include\wx\msw\popupwin.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\printwin.h
+SOURCE=..\..\include\wx\msw\printdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\private.h
+SOURCE=..\..\include\wx\msw\printwin.h
 # End Source File
 # Begin Source File
 
@@ -7444,7 +7855,7 @@ SOURCE=..\..\include\wx\msw\radiobut.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\regconf.h
+SOURCE=..\..\include\wx\msw\rcdefs.h
 # End Source File
 # Begin Source File
 
@@ -7452,10 +7863,6 @@ SOURCE=..\..\include\wx\msw\region.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\registry.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\msw\scrolbar.h
 # End Source File
 # Begin Source File
@@ -7468,7 +7875,7 @@ SOURCE=..\..\include\wx\msw\slider95.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\slidrmsw.h
+SOURCE=..\..\include\wx\msw\sound.h
 # End Source File
 # Begin Source File
 
@@ -7512,10 +7919,6 @@ SOURCE=..\..\include\wx\msw\tbar95.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\tbarmsw.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\msw\textctrl.h
 # End Source File
 # Begin Source File
@@ -7544,15 +7947,15 @@ SOURCE=..\..\include\wx\msw\ole\uuid.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\wave.h
+SOURCE=..\..\include\wx\msw\uxtheme.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\window.h
+SOURCE=..\..\include\wx\msw\uxthemep.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\gnuwin32\winresrc.h
+SOURCE=..\..\include\wx\msw\window.h
 # End Source File
 # End Group
 # Begin Group "Generic Headers"
@@ -7564,6 +7967,14 @@ SOURCE=..\..\include\wx\generic\accel.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\busyinfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\buttonbar.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\calctrl.h
 # End Source File
 # Begin Source File
@@ -7576,6 +7987,14 @@ SOURCE=..\..\include\wx\generic\colrdlgg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\dataview.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\datectrl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\dcpsg.h
 # End Source File
 # Begin Source File
@@ -7648,6 +8067,10 @@ SOURCE=..\..\include\wx\generic\notebook.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\numdlgg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\panelg.h
 # End Source File
 # Begin Source File
@@ -7664,6 +8087,10 @@ SOURCE=..\..\include\wx\generic\progdlgg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\propdlg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\sashwin.h
 # End Source File
 # Begin Source File
@@ -7864,15 +8291,15 @@ SOURCE=..\..\include\wx\univ\window.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\include\wx\html\forcelnk.h
+SOURCE=..\..\include\wx\html\helpctrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\html\helpctrl.h
+SOURCE=..\..\include\wx\html\helpdata.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\html\helpdata.h
+SOURCE=..\..\include\wx\html\helpdlg.h
 # End Source File
 # Begin Source File
 
@@ -7880,6 +8307,10 @@ SOURCE=..\..\include\wx\html\helpfrm.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\html\helpwnd.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\html\htmlcell.h
 # End Source File
 # Begin Source File
@@ -7984,6 +8415,10 @@ SOURCE=..\..\include\wx\choice.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\choicebk.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\clipbrd.h
 # End Source File
 # Begin Source File
@@ -8028,6 +8463,18 @@ SOURCE=..\..\include\wx\dataobj.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\dataview.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\datectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dateevt.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\dbgrid.h
 # End Source File
 # Begin Source File
@@ -8064,6 +8511,10 @@ SOURCE=..\..\include\wx\dcscreen.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\debugrpt.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\dialog.h
 # End Source File
 # Begin Source File
@@ -8084,6 +8535,10 @@ SOURCE=..\..\include\wx\display.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\display_impl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\dnd.h
 # End Source File
 # Begin Source File
@@ -8148,6 +8603,10 @@ SOURCE=..\..\include\wx\gauge.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\gbsizer.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\gdicmn.h
 # End Source File
 # Begin Source File
@@ -8280,6 +8739,10 @@ SOURCE=..\..\include\wx\mdi.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\mediactrl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\menu.h
 # End Source File
 # Begin Source File
@@ -8304,6 +8767,10 @@ SOURCE=..\..\include\wx\notebook.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\numdlg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\ownerdrw.h
 # End Source File
 # Begin Source File
@@ -8344,6 +8811,10 @@ SOURCE=..\..\include\wx\progdlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\propdlg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\ptr_scpd.h
 # End Source File
 # Begin Source File
@@ -8372,6 +8843,22 @@ SOURCE=..\..\include\wx\renderer.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\richtext\richtextbuffer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextstyles.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextxml.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\sashwin.h
 # End Source File
 # Begin Source File
@@ -8404,6 +8891,10 @@ SOURCE=..\..\include\wx\slider.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\sound.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\spinbutt.h
 # End Source File
 # Begin Source File
@@ -8480,6 +8971,10 @@ SOURCE=..\..\include\wx\toolbar.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\toolbook.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\tooltip.h
 # End Source File
 # Begin Source File
@@ -8492,6 +8987,10 @@ SOURCE=..\..\include\wx\treebase.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\treebook.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\treectrl.h
 # End Source File
 # Begin Source File
@@ -8536,10 +9035,194 @@ SOURCE=..\..\include\wx\wizard.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\wupdlock.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\wxhtml.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xrc\xh_all.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_bmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_bmpbt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_bttn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_cald.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_chckb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_chckl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_choic.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_choicbk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_combo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_datectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_dlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_frame.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_gauge.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_gdctl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_grid.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_html.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_listb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_listbk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_listc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_mdi.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_menu.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_notbk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_panel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_radbt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_radbx.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_scrol.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_scwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_sizer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_slidr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_spin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_split.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_statbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_stbmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_stbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_stlin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_sttxt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_text.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_tglbtn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_toolb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_tree.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_treebk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_unkwn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_wizrd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xmlres.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xpmdecod.h
 # End Source File
 # Begin Source File