Fix typos in picker control header names in files.bkl.

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

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 168712f0ffc1609abcb5ff7ff486c903db33d522..3142ed8738145a27f70252029161c0c12ec67bfa 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -2,10 +2,10 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=core - Win32 Debug USE_AUI_0
+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,42 +14,26 @@ CFG=core - Win32 Debug USE_AUI_0
 !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 Debug USE_AUI_0"
+!MESSAGE NMAKE /f "wx_core.mak" CFG="core - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "core - Win32 DLL Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Universal Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Universal Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Universal Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Universal Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Unicode Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Unicode Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Unicode Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Unicode Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Release USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Release USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Debug USE_AUI_1" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Debug USE_AUI_0" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 Universal Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Universal Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Unicode Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Unicode Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Unicode Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Unicode Debug USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Release USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Release USE_AUI_0" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Debug USE_AUI_1" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Debug USE_AUI_0" (based on "Win32 (x86) Static 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
@@ -59,32 +43,7 @@ CFG=core - Win32 Debug USE_AUI_0
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# 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 Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivudll\core"
-# PROP Target_Dir ""
-# 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
-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 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -109,32 +68,7 @@ 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 DLL Universal Unicode Debug USE_AUI_1"
-
-# 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 Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivuddll\core"
-# PROP Target_Dir ""
-# 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
-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 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -159,32 +93,7 @@ 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 DLL Universal Release USE_AUI_1"
-
-# 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 Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivdll\core"
-# PROP Target_Dir ""
-# 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
-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 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -209,32 +118,7 @@ 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 DLL Universal Debug USE_AUI_1"
-
-# 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 Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswunivddll\core"
-# PROP Target_Dir ""
-# 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
-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 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -259,32 +143,7 @@ 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 DLL Unicode Release USE_AUI_1"
-
-# 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 Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\core"
-# PROP Target_Dir ""
-# 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
-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 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -309,32 +168,7 @@ 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 DLL Unicode Debug USE_AUI_1"
-
-# 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 Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\core"
-# PROP Target_Dir ""
-# 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
-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 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -359,32 +193,7 @@ 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 DLL Release USE_AUI_1"
-
-# 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 Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswdll\core"
-# PROP Target_Dir ""
-# 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
-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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -409,32 +218,7 @@ 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 USE_AUI_1"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswddll\core"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswddll\core"
-# PROP Target_Dir ""
-# 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 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 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 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -459,7 +243,7 @@ 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\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 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -482,245 +266,107 @@ 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 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivu\core"
+# PROP BASE Intermediate_Dir "vc_mswunivud\core"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
+# PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivu\core"
+# PROP Intermediate_Dir "vc_mswunivud\core"
 # PROP Target_Dir ""
-# 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 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
 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"
+# 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 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswunivud\core"
+# PROP BASE Intermediate_Dir "vc_mswuniv\core"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
+# PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivud\core"
+# PROP Intermediate_Dir "vc_mswuniv\core"
 # PROP Target_Dir ""
-# 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 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
 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"
+# 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 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 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_mswunivud\core"
+# 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_lib"
-# PROP Intermediate_Dir "vc_mswunivud\core"
+# PROP Intermediate_Dir "vc_mswunivd\core"
 # PROP Target_Dir ""
-# 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 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
 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"
+# 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 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 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 Intermediate_Dir "vc_mswu\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 Intermediate_Dir "vc_mswu\core"
 # PROP Target_Dir ""
-# 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 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
 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"
+# 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 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswuniv\core"
+# PROP BASE Intermediate_Dir "vc_mswud\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 Target_Dir ""
-# 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
-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 Universal Debug USE_AUI_1"
-
-# 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 Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\core"
-# PROP Target_Dir ""
-# 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
-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 Universal Debug USE_AUI_0"
-
-# 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 Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswunivd\core"
-# PROP Target_Dir ""
-# 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
-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 Unicode Release USE_AUI_1"
-
-# 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 Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\core"
-# PROP Target_Dir ""
-# 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
-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 Unicode Release USE_AUI_0"
-
-# 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 Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\core"
-# PROP Target_Dir ""
-# 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
-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 Unicode Debug USE_AUI_1"
-
-# 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 Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\core"
-# PROP Target_Dir ""
-# 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
-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 Unicode Debug USE_AUI_0"
-
-# 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 Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
+# PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\core"
 # PROP Target_Dir ""
@@ -735,30 +381,7 @@ 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 Release USE_AUI_1"
-
-# 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 Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_msw\core"
-# PROP Target_Dir ""
-# 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
-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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -781,30 +404,7 @@ 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 USE_AUI_1"
-
-# 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"
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -831,38 +431,22 @@ LIB32=link.exe -lib
 
 # Begin Target
 
-# Name "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-# Name "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-# Name "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-# Name "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-# Name "core - Win32 DLL Universal Release USE_AUI_1"
-# Name "core - Win32 DLL Universal Release USE_AUI_0"
-# Name "core - Win32 DLL Universal Debug USE_AUI_1"
-# Name "core - Win32 DLL Universal Debug USE_AUI_0"
-# Name "core - Win32 DLL Unicode Release USE_AUI_1"
-# Name "core - Win32 DLL Unicode Release USE_AUI_0"
-# Name "core - Win32 DLL Unicode Debug USE_AUI_1"
-# Name "core - Win32 DLL Unicode Debug USE_AUI_0"
-# Name "core - Win32 DLL Release USE_AUI_1"
-# Name "core - Win32 DLL Release USE_AUI_0"
-# Name "core - Win32 DLL Debug USE_AUI_1"
-# Name "core - Win32 DLL Debug USE_AUI_0"
-# Name "core - Win32 Universal Unicode Release USE_AUI_1"
-# Name "core - Win32 Universal Unicode Release USE_AUI_0"
-# Name "core - Win32 Universal Unicode Debug USE_AUI_1"
-# Name "core - Win32 Universal Unicode Debug USE_AUI_0"
-# Name "core - Win32 Universal Release USE_AUI_1"
-# Name "core - Win32 Universal Release USE_AUI_0"
-# Name "core - Win32 Universal Debug USE_AUI_1"
-# Name "core - Win32 Universal Debug USE_AUI_0"
-# Name "core - Win32 Unicode Release USE_AUI_1"
-# Name "core - Win32 Unicode Release USE_AUI_0"
-# Name "core - Win32 Unicode Debug USE_AUI_1"
-# Name "core - Win32 Unicode Debug USE_AUI_0"
-# Name "core - Win32 Release USE_AUI_1"
-# Name "core - Win32 Release USE_AUI_0"
-# Name "core - Win32 Debug USE_AUI_1"
-# Name "core - Win32 Debug USE_AUI_0"
+# 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 ""
@@ -1224,116 +808,123 @@ SOURCE=..\..\src\common\xpmdecod.cpp
 
 SOURCE=..\..\src\msw\accel.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+# PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+# PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\ole\access.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
 !ENDIF
@@ -1341,118 +932,141 @@ SOURCE=..\..\src\msw\accel.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\ole\access.cpp
+SOURCE=..\..\src\msw\app.cpp
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\msw\ole\automtn.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\bitmap.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+SOURCE=..\..\src\msw\bmpbuttn.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!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 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+SOURCE=..\..\src\msw\brush.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\button.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
 !ENDIF
@@ -1460,7082 +1074,1178 @@ SOURCE=..\..\src\msw\ole\access.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\app.cpp
+SOURCE=..\..\src\msw\caret.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\ole\automtn.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\checkbox.cpp
 
-SOURCE=..\..\src\msw\bitmap.cpp
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-SOURCE=..\..\src\msw\bmpbuttn.cpp
+# PROP Exclude_From_Build 1
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\msw\checklst.cpp
 
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\brush.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\button.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\caret.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\checkbox.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\checklst.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\choice.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\clipbrd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\colordlg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\colour.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\combo.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\combobox.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\control.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\cursor.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\data.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\dataobj.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dcclient.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dcmemory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dcprint.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dcscreen.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dialog.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!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 USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\display.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\dragimag.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\dropsrc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\droptgt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\enhmeta.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\evtloop.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\fdrepdlg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\filedlg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\font.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\fontdlg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\fontenum.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\fontutil.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\frame.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\gauge95.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\gdiimage.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\gdiobj.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\gsockmsw.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\helpchm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\helpwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\icon.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\imaglist.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\iniconf.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\listbox.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\listctrl.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\mdi.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\menu.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\menuitem.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\metafile.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\minifram.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\msgdlg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\mslu.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\nativdlg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\notebook.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\oleutils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ownerdrw.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\palette.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\pen.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\popupwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\printdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\printwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\radiobox.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\radiobut.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\region.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\renderer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\scrolbar.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\settings.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\slider95.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\spinbutt.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\spinctrl.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\statbmp.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\statbox.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\statbr95.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\statline.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\stattext.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\tabctrl.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\tbar95.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\textctrl.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\tglbtn.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\timer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\tooltip.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\toplevel.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\treectrl.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\utilsgui.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\uuid.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\uxtheme.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\version.rc
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\volume.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\window.cpp
-# End Source File
-# End Group
-# Begin Group "Generic Sources"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\generic\accel.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\busyinfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\buttonbar.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\clrpickerg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\colrdlgg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\combog.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\dcpsg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\dirctrlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\dirdlgg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\dragimgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\fdrepdlg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ENDIF
 
-# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\msw\choice.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\filedlgg.cpp
+SOURCE=..\..\src\msw\clipbrd.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\colordlg.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+SOURCE=..\..\src\msw\colour.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\combo.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\generic\filepickerg.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+
+!ENDIF
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\fontdlgg.cpp
+SOURCE=..\..\src\msw\combobox.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\control.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\fontpickerg.cpp
+SOURCE=..\..\src\msw\cursor.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\imaglist.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\msw\data.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\ole\dataobj.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+SOURCE=..\..\src\msw\dc.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\dcclient.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+SOURCE=..\..\src\msw\dcmemory.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\dcprint.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+SOURCE=..\..\src\msw\dcscreen.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\dialog.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\dialup.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+SOURCE=..\..\src\msw\dib.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\dirdlg.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!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\generic\listbkg.cpp
+SOURCE=..\..\src\msw\display.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\listctrl.cpp
+SOURCE=..\..\src\msw\dragimag.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\ole\dropsrc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\ole\droptgt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\enhmeta.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\evtloop.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\fdrepdlg.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\logg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\mdig.cpp
+SOURCE=..\..\src\msw\filedlg.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\font.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\fontdlg.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\msgdlgg.cpp
+SOURCE=..\..\src\msw\fontenum.cpp
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\msw\fontutil.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\frame.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
-
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\gauge95.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\generic\numdlgg.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-SOURCE=..\..\src\generic\panelg.cpp
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\generic\printps.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+
+!ENDIF
 
-SOURCE=..\..\src\generic\prntdlgg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\progdlgg.cpp
+SOURCE=..\..\src\msw\gdiimage.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\renderg.cpp
+SOURCE=..\..\src\msw\gdiobj.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\scrlwing.cpp
+SOURCE=..\..\src\msw\gsockmsw.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\selstore.cpp
+SOURCE=..\..\src\msw\helpchm.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\spinctlg.cpp
+SOURCE=..\..\src\msw\helpwin.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\splitter.cpp
+SOURCE=..\..\src\msw\icon.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\statusbr.cpp
+SOURCE=..\..\src\msw\imaglist.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+# PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+# PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\iniconf.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
 !ENDIF
@@ -8543,1696 +2253,1771 @@ SOURCE=..\..\src\generic\statusbr.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\tabg.cpp
+SOURCE=..\..\src\msw\listbox.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\listctrl.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-SOURCE=..\..\src\generic\textdlgg.cpp
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\generic\tipwin.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-SOURCE=..\..\src\generic\toolbkg.cpp
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\generic\treebkg.cpp
-# End Source File
-# Begin Source File
+!ENDIF
 
-SOURCE=..\..\src\generic\treectlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\vlbox.cpp
+SOURCE=..\..\src\msw\main.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\vscroll.cpp
-# End Source File
-# End Group
-# Begin Group "wxUniv Sources"
+SOURCE=..\..\src\msw\mdi.cpp
 
-# PROP Default_Filter ""
-# Begin Source File
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-SOURCE=..\..\src\univ\bmpbuttn.cpp
+# PROP Exclude_From_Build 1
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ENDIF
 
-# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\menu.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\button.cpp
+SOURCE=..\..\src\msw\menuitem.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\metafile.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-SOURCE=..\..\src\univ\checkbox.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+SOURCE=..\..\src\msw\minifram.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\msgdlg.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+SOURCE=..\..\src\msw\mslu.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\nativdlg.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!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\univ\checklst.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\notebook.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+SOURCE=..\..\src\msw\ole\oleutils.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\ownerdrw.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-SOURCE=..\..\src\univ\choice.cpp
+# PROP Exclude_From_Build 1
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+SOURCE=..\..\src\msw\palette.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\pen.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+SOURCE=..\..\src\msw\popupwin.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\printdlg.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+SOURCE=..\..\src\msw\printwin.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\radiobox.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+# PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+# PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+# PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+# PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\radiobut.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\univ\colschem.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ENDIF
 
-# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+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
+
+SOURCE=..\..\src\msw\scrolbar.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\combobox.cpp
+SOURCE=..\..\src\msw\settings.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\slider95.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\spinbutt.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\control.cpp
+SOURCE=..\..\src\msw\spinctrl.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
+
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\statbmp.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\ctrlrend.cpp
+SOURCE=..\..\src\msw\statbox.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\statbr95.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\dialog.cpp
+SOURCE=..\..\src\msw\statline.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
+
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\stattext.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\framuniv.cpp
+SOURCE=..\..\src\msw\tabctrl.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\tbar95.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\gauge.cpp
+SOURCE=..\..\src\msw\textctrl.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
+
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\tglbtn.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\themes\gtk.cpp
+SOURCE=..\..\src\msw\timer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\tooltip.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\toplevel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\treectrl.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\utilsgui.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\ole\uuid.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\uxtheme.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\version.rc
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -10241,117 +4026,156 @@ SOURCE=..\..\src\univ\themes\gtk.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\inpcons.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\msw\volume.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\window.cpp
+# End Source File
+# End Group
+# Begin Group "Generic Sources"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+# PROP Default_Filter ""
+# Begin Source File
 
+SOURCE=..\..\src\generic\accel.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!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 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\busyinfo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\buttonbar.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\choicbkg.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\generic\choicdgg.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\generic\clrpickerg.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\colrdlgg.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -10360,117 +4184,140 @@ SOURCE=..\..\src\univ\inpcons.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\inphand.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\generic\combog.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\dcpsg.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+SOURCE=..\..\src\generic\dirctrlg.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\dirdlgg.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+SOURCE=..\..\src\generic\dragimgg.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\fdrepdlg.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -10479,117 +4326,128 @@ SOURCE=..\..\src\univ\inphand.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\listbox.cpp
+SOURCE=..\..\src\generic\filedlgg.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+SOURCE=..\..\src\generic\filepickerg.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\fontdlgg.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -10598,117 +4456,132 @@ SOURCE=..\..\src\univ\listbox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\menu.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\generic\fontpickerg.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\imaglist.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+SOURCE=..\..\src\generic\listbkg.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\listctrl.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -10717,117 +4590,128 @@ SOURCE=..\..\src\univ\menu.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\themes\metal.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\generic\logg.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\mdig.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# PROP Exclude_From_Build 1
 
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\msgdlgg.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -10836,117 +4720,164 @@ SOURCE=..\..\src\univ\themes\metal.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\notebook.cpp
+SOURCE=..\..\src\generic\numdlgg.cpp
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\generic\panelg.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\printps.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+SOURCE=..\..\src\generic\prntdlgg.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\progdlgg.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+SOURCE=..\..\src\generic\renderg.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\scrlwing.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+SOURCE=..\..\src\generic\selstore.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\spinctlg.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+SOURCE=..\..\src\generic\splitter.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\statusbr.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
 
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+!ENDIF
+
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+SOURCE=..\..\src\generic\tabg.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -10955,117 +4886,156 @@ SOURCE=..\..\src\univ\notebook.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\radiobox.cpp
+SOURCE=..\..\src\generic\textdlgg.cpp
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\generic\tipwin.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\toolbkg.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+SOURCE=..\..\src\generic\treebkg.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\treectlg.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+SOURCE=..\..\src\generic\vlbox.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\vscroll.cpp
+# End Source File
+# End Group
+# Begin Group "wxUniv Sources"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+# PROP Default_Filter ""
+# Begin Source File
 
+SOURCE=..\..\src\univ\bmpbuttn.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+# PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+# PROP Exclude_From_Build 1
 
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\univ\button.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -11074,117 +5044,124 @@ SOURCE=..\..\src\univ\radiobox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\radiobut.cpp
+SOURCE=..\..\src\univ\checkbox.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ENDIF
 
-# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+SOURCE=..\..\src\univ\checklst.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -11193,117 +5170,124 @@ SOURCE=..\..\src\univ\radiobut.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\scrarrow.cpp
+SOURCE=..\..\src\univ\choice.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\univ\colschem.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -11312,117 +5296,124 @@ SOURCE=..\..\src\univ\scrarrow.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\scrolbar.cpp
+SOURCE=..\..\src\univ\combobox.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\univ\control.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -11431,117 +5422,124 @@ SOURCE=..\..\src\univ\scrolbar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\scrthumb.cpp
+SOURCE=..\..\src\univ\ctrlrend.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\univ\dialog.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -11550,117 +5548,124 @@ SOURCE=..\..\src\univ\scrthumb.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\slider.cpp
+SOURCE=..\..\src\univ\framuniv.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\univ\gauge.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -11669,117 +5674,124 @@ SOURCE=..\..\src\univ\slider.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\spinbutt.cpp
+SOURCE=..\..\src\univ\themes\gtk.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\univ\inpcons.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -11788,117 +5800,124 @@ SOURCE=..\..\src\univ\spinbutt.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\statbmp.cpp
+SOURCE=..\..\src\univ\inphand.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\univ\listbox.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -11907,117 +5926,124 @@ SOURCE=..\..\src\univ\statbmp.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\statbox.cpp
+SOURCE=..\..\src\univ\menu.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\univ\themes\metal.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -12026,117 +6052,124 @@ SOURCE=..\..\src\univ\statbox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\statline.cpp
+SOURCE=..\..\src\univ\notebook.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\univ\radiobox.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -12145,117 +6178,124 @@ SOURCE=..\..\src\univ\statline.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\stattext.cpp
+SOURCE=..\..\src\univ\radiobut.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\univ\scrarrow.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -12264,117 +6304,124 @@ SOURCE=..\..\src\univ\stattext.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\statusbr.cpp
+SOURCE=..\..\src\univ\scrolbar.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\univ\scrthumb.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -12383,117 +6430,124 @@ SOURCE=..\..\src\univ\statusbr.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\textctrl.cpp
+SOURCE=..\..\src\univ\slider.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ENDIF
+
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\univ\spinbutt.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -12502,117 +6556,124 @@ SOURCE=..\..\src\univ\textctrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\tglbtn.cpp
+SOURCE=..\..\src\univ\statbmp.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\univ\statbox.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -12621,117 +6682,124 @@ SOURCE=..\..\src\univ\tglbtn.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\theme.cpp
+SOURCE=..\..\src\univ\statline.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\univ\stattext.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -12740,117 +6808,124 @@ SOURCE=..\..\src\univ\theme.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\toolbar.cpp
+SOURCE=..\..\src\univ\statusbr.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\univ\textctrl.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -12859,117 +6934,124 @@ SOURCE=..\..\src\univ\toolbar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\topluniv.cpp
+SOURCE=..\..\src\univ\tglbtn.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\univ\theme.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -12978,117 +7060,124 @@ SOURCE=..\..\src\univ\topluniv.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\themes\win32.cpp
+SOURCE=..\..\src\univ\toolbar.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\univ\topluniv.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -13097,117 +7186,124 @@ SOURCE=..\..\src\univ\themes\win32.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\winuniv.cpp
+SOURCE=..\..\src\univ\themes\win32.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\univ\winuniv.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # PROP Exclude_From_Build 1
 
@@ -13222,65 +7318,31 @@ SOURCE=..\..\src\univ\winuniv.cpp
 
 SOURCE=..\..\include\wx\msw\setup.h
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - 
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - 
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # Begin Custom Build - 
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # Begin Custom Build - 
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
@@ -13290,17 +7352,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-# 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
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
@@ -13310,17 +7362,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-# 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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
@@ -13330,17 +7372,7 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\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 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
@@ -13350,125 +7382,61 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # Begin Custom Build - 
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - 
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # Begin Custom Build - 
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # Begin Custom Build - 
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\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
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\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
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\msw\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
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\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\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
 InputPath=..\include\wx\msw\setup.h
@@ -13485,17 +7453,7 @@ InputPath=..\include\wx\msw\setup.h
 
 SOURCE=..\..\include\wx\univ\setup.h
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\univ\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 DLL Universal Unicode Release USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
@@ -13505,17 +7463,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\univ\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 DLL Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
@@ -13525,17 +7473,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\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
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
@@ -13545,17 +7483,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\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
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
@@ -13565,65 +7493,31 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # Begin Custom Build - 
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - 
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # Begin Custom Build - 
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # Begin Custom Build - 
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\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
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
@@ -13633,17 +7527,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\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
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
@@ -13653,17 +7537,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\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
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
@@ -13673,7 +7547,7 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
 InputPath=..\include\wx\univ\setup.h
@@ -13683,59 +7557,25 @@ InputPath=..\include\wx\univ\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\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
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # Begin Custom Build - 
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # Begin Custom Build - 
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # Begin Custom Build - 
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # Begin Custom Build - 
 
@@ -13928,16 +7768,7 @@ SOURCE=..\..\include\wx\msw\gdiimage.h
 
 SOURCE=..\..\include\wx\msw\genrcdefs.h
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
-
-# 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 Release USE_AUI_0"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
 
@@ -13946,16 +7777,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
-
-# 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 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
 
@@ -13964,16 +7786,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
-
-# 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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
 
@@ -13982,16 +7795,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
-
-# 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 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
 
@@ -14000,16 +7804,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
-
-# 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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
 
@@ -14018,16 +7813,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
-
-# 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 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
 
@@ -14036,16 +7822,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
-
-# 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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
 
@@ -14054,16 +7831,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
-
-# 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 DLL Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
 
@@ -14072,16 +7840,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
-
-# 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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
 
@@ -14090,16 +7849,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
-
-# 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 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
 
@@ -14108,16 +7858,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
-
-# 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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
 
@@ -14126,16 +7867,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
-
-# 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 Universal Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
 
@@ -14144,16 +7876,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
-
-# 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 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
 
@@ -14162,16 +7885,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
-
-# 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 Unicode Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 
@@ -14180,16 +7894,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
-
-# 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"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 
@@ -14198,16 +7903,7 @@ SOURCE=..\..\include\wx\msw\genrcdefs.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
-
-"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
-       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 
@@ -15337,6 +9033,10 @@ SOURCE=..\..\include\wx\pen.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\pickerbase.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\popupwin.h
 # End Source File
 # Begin Source File