added the cast to wxFontMapperBase erroneously removed by the last change

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

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 3bcb131160798e435698de2ca09b4a6d2bfac4ff..168712f0ffc1609abcb5ff7ff486c903db33d522 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -1,11 +1,11 @@
-# Microsoft Developer Studio Project File - Name="core" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="wx_core" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=core - Win32 Debug
+CFG=core - Win32 Debug USE_AUI_0
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -14,26 +14,42 @@ CFG=core - Win32 Debug
 !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"
+!MESSAGE NMAKE /f "wx_core.mak" CFG="core - Win32 Debug USE_AUI_0"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!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 "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 
 
 # Begin Project
@@ -43,7 +59,32 @@ CFG=core - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!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"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -55,20 +96,45 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswunivudll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv253u_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 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv253u_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 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 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE 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 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 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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv253u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_core.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib 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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv253u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_core.lib"
+# 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"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -80,20 +146,45 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswunivuddll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv253ud_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 /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv253ud_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 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 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE 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 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 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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv253ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_core.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib 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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv253ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_core.lib" /debug
+# 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"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -105,20 +196,45 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswunivdll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv253_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 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv253_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 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 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE 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 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 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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv253_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_core.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv253_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_core.lib"
+# 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"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -130,20 +246,45 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswunivddll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv253d_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 /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv253d_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 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 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE 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 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 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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv253d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_core.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv253d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_core.lib" /debug
+# 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"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -155,20 +296,45 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswudll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw253u_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 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw253u_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 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 0x405 /d "__WXMSW__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE 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 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 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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw253u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_core.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib 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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw253u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_core.lib"
+# 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"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -180,20 +346,45 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswuddll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw253ud_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 /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw253ud_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 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 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE 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 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 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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw253ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_core.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib 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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw253ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_core.lib" /debug
+# 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"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -205,20 +396,20 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswdll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw253_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 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw253_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 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 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE 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 oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw253_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_core.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw253_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_core.lib"
+# 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"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -230,20 +421,68 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswddll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw253d_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 /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw253d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw270d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw270d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw253d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_core.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw253d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_core.lib" /debug
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_core.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase27d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw270d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw27d_core.lib" /debug
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
+# 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 Universal 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_mswunivu\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswunivu\core"
+# PROP 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 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"
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -255,18 +494,41 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswunivu\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /Fd..\..\lib\vc_lib\wxmswuniv25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /Fd..\..\lib\vc_lib\wxmswuniv25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv27u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+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 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_mswunivud\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 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 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\wxmswuniv25u_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25u_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"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -278,18 +540,41 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswunivud\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_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\wxmswuniv27ud_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv27ud_core.lib"
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal 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_mswuniv\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\wxmswuniv25ud_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25ud_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 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -301,18 +586,41 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswuniv\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /Fd..\..\lib\vc_lib\wxmswuniv25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /Fd..\..\lib\vc_lib\wxmswuniv25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_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\wxmswuniv25_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25_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 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -324,18 +632,41 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswunivd\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_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\wxmswuniv25d_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25d_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 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -347,18 +678,41 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswu\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /Fd..\..\lib\vc_lib\wxmsw25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /Fd..\..\lib\vc_lib\wxmsw25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_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\wxmsw25u_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25u_core.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"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -370,18 +724,18 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_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\wxmsw25ud_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25ud_core.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"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -393,63 +747,125 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_msw\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /Fd..\..\lib\vc_lib\wxmsw25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /Fd..\..\lib\vc_lib\wxmsw25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_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\wxmsw25_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25_core.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"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 # 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_mswd\core"
+# PROP BASE Intermediate_Dir "vc_msw\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_mswd\core"
+# PROP Intermediate_Dir "vc_msw\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# 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\wxmsw25d_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25d_core.lib"
-
-!ENDIF
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27_core.lib"
 
-# Begin Target
-
-# 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"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Default_Filter ""
+# 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"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswd\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswd\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw27d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw27d_core.lib"
+
+!ENDIF
+
+# Begin Target
+
+# Name "core - Win32 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"
+# Begin Group "Common Sources"
+
+# PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=..\..\src\common\accesscmn.cpp
@@ -484,6 +900,10 @@ SOURCE=..\..\src\common\clipcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\clrpickercmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\cmdproc.cpp
 # End Source File
 # Begin Source File
@@ -492,6 +912,14 @@ SOURCE=..\..\src\common\cmndata.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\colourcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\combocmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\containr.cpp
 # End Source File
 # Begin Source File
@@ -544,6 +972,12 @@ SOURCE=..\..\src\common\dseldlg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\effects.cpp
 # End Source File
 # Begin Source File
@@ -552,10 +986,18 @@ SOURCE=..\..\src\common\event.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\evtloopcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\fddlgcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\filepickercmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\fldlgcmn.cpp
 # End Source File
 # Begin Source File
@@ -564,10 +1006,18 @@ SOURCE=..\..\src\common\fontcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\fontenumcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\fontmap.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\fontpickercmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\framecmn.cpp
 # End Source File
 # Begin Source File
@@ -680,6 +1130,10 @@ SOURCE=..\..\src\common\paper.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\pickerbase.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\popupcmn.cpp
 # End Source File
 # Begin Source File
@@ -770,265 +1224,235 @@ SOURCE=..\..\src\common\xpmdecod.cpp
 
 SOURCE=..\..\src\msw\accel.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\ole\access.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\app.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-SOURCE=..\..\src\msw\ole\automtn.cpp
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\bitmap.cpp
+!ENDIF
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\bmpbuttn.cpp
+SOURCE=..\..\src\msw\ole\access.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\brush.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\msw\button.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 
 !ENDIF
@@ -1036,129 +1460,130 @@ SOURCE=..\..\src\msw\button.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\caret.cpp
+SOURCE=..\..\src\msw\app.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\checkbox.cpp
+SOURCE=..\..\src\msw\ole\automtn.cpp
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\src\msw\bitmap.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\bmpbuttn.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\checklst.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 
 !ENDIF
@@ -1166,129 +1591,122 @@ SOURCE=..\..\src\msw\checklst.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\choice.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\src\msw\brush.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\button.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\clipbrd.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\msw\colordlg.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 
 !ENDIF
@@ -1296,129 +1714,122 @@ SOURCE=..\..\src\msw\colordlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\colour.cpp
+SOURCE=..\..\src\msw\caret.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\combobox.cpp
+SOURCE=..\..\src\msw\checkbox.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\control.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 
 !ENDIF
@@ -1426,380 +1837,360 @@ SOURCE=..\..\src\msw\control.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\cursor.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\checklst.cpp
 
-SOURCE=..\..\src\msw\data.cpp
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
-SOURCE=..\..\src\msw\ole\dataobj.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1
 
-SOURCE=..\..\src\msw\dc.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
-SOURCE=..\..\src\msw\dcclient.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1
 
-SOURCE=..\..\src\msw\dcmemory.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
-SOURCE=..\..\src\msw\dcprint.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1
 
-SOURCE=..\..\src\msw\dcscreen.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
-SOURCE=..\..\src\msw\dialog.cpp
+# PROP Exclude_From_Build 1
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!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 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\dialup.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-SOURCE=..\..\src\msw\dib.cpp
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\dirdlg.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\choice.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\display.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
-SOURCE=..\..\src\msw\dragimag.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\ole\dropsrc.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-SOURCE=..\..\src\msw\ole\droptgt.cpp
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+
+
+!ENDIF
 
-SOURCE=..\..\src\msw\enhmeta.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\evtloop.cpp
+SOURCE=..\..\src\msw\clipbrd.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\fdrepdlg.cpp
+SOURCE=..\..\src\msw\colordlg.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\filedlg.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 
 !ENDIF
@@ -1807,137 +2198,122 @@ SOURCE=..\..\src\msw\filedlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\font.cpp
+SOURCE=..\..\src\msw\colour.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\fontdlg.cpp
+SOURCE=..\..\src\msw\combo.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\fontenum.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-SOURCE=..\..\src\msw\fontutil.cpp
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\frame.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 
 !ENDIF
@@ -1945,150 +2321,118 @@ SOURCE=..\..\src\msw\frame.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\gauge95.cpp
+SOURCE=..\..\src\msw\combobox.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
-
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
-SOURCE=..\..\src\msw\gdiimage.cpp
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\gdiobj.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
-SOURCE=..\..\src\msw\gsockmsw.cpp
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\helpchm.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-SOURCE=..\..\src\msw\helpwin.cpp
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\icon.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\msw\imaglist.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 
 !ENDIF
@@ -2096,255 +2440,269 @@ SOURCE=..\..\src\msw\imaglist.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\iniconf.cpp
+SOURCE=..\..\src\msw\control.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!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"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!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
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1
 
-SOURCE=..\..\src\msw\listbox.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
+
+# PROP Exclude_From_Build 1
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ENDIF
 
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+SOURCE=..\..\src\msw\cursor.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\data.cpp
+# End Source File
+# Begin Source File
 
-!ENDIF
+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\listctrl.cpp
+SOURCE=..\..\src\msw\dcclient.cpp
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\src\msw\dcmemory.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\dcprint.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\src\msw\dcscreen.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\dialog.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\main.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\msw\mdi.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 
 !ENDIF
@@ -2352,125 +2710,126 @@ SOURCE=..\..\src\msw\mdi.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\menu.cpp
+SOURCE=..\..\src\msw\dialup.cpp
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\src\msw\dib.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\dirdlg.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\menuitem.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 
 !ENDIF
@@ -2478,129 +2837,122 @@ SOURCE=..\..\src\msw\menuitem.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\metafile.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\src\msw\display.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\dragimag.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\minifram.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\msw\msgdlg.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 
 !ENDIF
@@ -2608,129 +2960,134 @@ SOURCE=..\..\src\msw\msgdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\mslu.cpp
+SOURCE=..\..\src\msw\ole\dropsrc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\nativdlg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\src\msw\ole\droptgt.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\enhmeta.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\src\msw\evtloop.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\fdrepdlg.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\notebook.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 
 !ENDIF
@@ -2738,149 +3095,118 @@ SOURCE=..\..\src\msw\notebook.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\ole\oleutils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ownerdrw.cpp
+SOURCE=..\..\src\msw\filedlg.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\palette.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
-SOURCE=..\..\src\msw\pen.cpp
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\popupwin.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-SOURCE=..\..\src\msw\printdlg.cpp
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\printwin.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\msw\radiobox.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 
 !ENDIF
@@ -2888,133 +3214,122 @@ SOURCE=..\..\src\msw\radiobox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\radiobut.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\src\msw\font.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\fontdlg.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\region.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-SOURCE=..\..\src\msw\renderer.cpp
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\scrolbar.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 
 !ENDIF
@@ -3022,129 +3337,126 @@ SOURCE=..\..\src\msw\scrolbar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\settings.cpp
+SOURCE=..\..\src\msw\fontenum.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\slider95.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\src\msw\fontutil.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\frame.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\spinbutt.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 
 !ENDIF
@@ -3152,125 +3464,118 @@ SOURCE=..\..\src\msw\spinbutt.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\spinctrl.cpp
+SOURCE=..\..\src\msw\gauge95.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\statbmp.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 
 !ENDIF
@@ -3278,125 +3583,142 @@ SOURCE=..\..\src\msw\statbmp.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\statbox.cpp
+SOURCE=..\..\src\msw\gdiimage.cpp
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\src\msw\gdiobj.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\gsockmsw.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\src\msw\helpchm.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\helpwin.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\msw\icon.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\imaglist.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\statbr95.cpp
+!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"
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 
 !ENDIF
@@ -3404,125 +3726,118 @@ SOURCE=..\..\src\msw\statbr95.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\statline.cpp
+SOURCE=..\..\src\msw\iniconf.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\stattext.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 
 !ENDIF
@@ -3530,129 +3845,118 @@ SOURCE=..\..\src\msw\stattext.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\stdpaths.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\tabctrl.cpp
+SOURCE=..\..\src\msw\listbox.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\tbar95.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 
 !ENDIF
@@ -3660,125 +3964,118 @@ SOURCE=..\..\src\msw\tbar95.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\textctrl.cpp
+SOURCE=..\..\src\msw\listctrl.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\tglbtn.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 
 !ENDIF
@@ -3786,3154 +4083,3045 @@ SOURCE=..\..\src\msw\tglbtn.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\timer.cpp
+SOURCE=..\..\src\msw\main.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\tooltip.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\mdi.cpp
 
-SOURCE=..\..\src\msw\toplevel.cpp
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
-SOURCE=..\..\src\msw\treectrl.cpp
+# PROP Exclude_From_Build 1
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!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"
 
-!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"
 
+!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"
+
+!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 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1
 
-SOURCE=..\..\src\msw\utilsgui.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-SOURCE=..\..\src\msw\ole\uuid.cpp
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\msw\uxtheme.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-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 Unicode Debug USE_AUI_1"
 
-# PROP Default_Filter ""
-# Begin Source File
 
-SOURCE=..\..\src\generic\accel.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\menu.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\generic\busyinfo.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
-SOURCE=..\..\src\generic\choicbkg.cpp
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\generic\choicdgg.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
-SOURCE=..\..\src\generic\colrdlgg.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\generic\dcpsg.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-SOURCE=..\..\src\generic\dirctrlg.cpp
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\generic\dirdlgg.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ENDIF
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\menuitem.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\generic\dragimgg.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\generic\fdrepdlg.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\filedlgg.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
-
+SOURCE=..\..\src\msw\metafile.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
-
+!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"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+!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
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\generic\fontdlgg.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\imaglist.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\src\msw\minifram.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\msgdlg.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\generic\listbkg.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\generic\listctrl.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\logg.cpp
+SOURCE=..\..\src\msw\mslu.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\mdig.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
-
+SOURCE=..\..\src\msw\nativdlg.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
-
+!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"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+!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
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\generic\msgdlgg.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\numdlgg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\notebook.cpp
 
-SOURCE=..\..\src\generic\panelg.cpp
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
-SOURCE=..\..\src\generic\printps.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1
 
-SOURCE=..\..\src\generic\prntdlgg.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
-SOURCE=..\..\src\generic\progdlgg.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1
 
-SOURCE=..\..\src\generic\renderg.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
-SOURCE=..\..\src\generic\scrlwing.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1
 
-SOURCE=..\..\src\generic\selstore.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
-SOURCE=..\..\src\generic\spinctlg.cpp
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1
 
-SOURCE=..\..\src\generic\splitter.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
-SOURCE=..\..\src\generic\statusbr.cpp
+# PROP Exclude_From_Build 1
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!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 Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+
+!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 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\generic\tabg.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
+!ENDIF
+
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+SOURCE=..\..\src\msw\ole\oleutils.cpp
+# End Source File
+# Begin Source File
 
-# PROP Exclude_From_Build 1
+SOURCE=..\..\src\msw\ownerdrw.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\generic\textdlgg.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-SOURCE=..\..\src\generic\tipwin.cpp
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\generic\treectlg.cpp
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL 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 Unicode Debug USE_AUI_0"
 
-# PROP Default_Filter ""
-# Begin Source File
 
-SOURCE=..\..\src\univ\bmpbuttn.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!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"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\button.cpp
+SOURCE=..\..\src\msw\palette.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\pen.cpp
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\src\msw\popupwin.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\printdlg.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\src\msw\printwin.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\radiobox.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\univ\checkbox.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\checklst.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
-
+SOURCE=..\..\src\msw\radiobut.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+!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
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\univ\choice.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\colschem.cpp
+SOURCE=..\..\src\msw\region.cpp
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\src\msw\renderer.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\scrolbar.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
-
+!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"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+!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
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\univ\combobox.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\control.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\src\msw\settings.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\slider95.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+!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
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\univ\ctrlrend.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\dialog.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
-
+SOURCE=..\..\src\msw\spinbutt.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
-
+!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"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+!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
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\univ\framuniv.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\gauge.cpp
+SOURCE=..\..\src\msw\spinctrl.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!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"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!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"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
-
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
-
-!ENDIF
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\univ\themes\gtk.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\inpcons.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
-
+SOURCE=..\..\src\msw\statbmp.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
-
+!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"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+!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
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\univ\inphand.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\listbox.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
-
+SOURCE=..\..\src\msw\statbox.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+!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
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\univ\menu.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\themes\metal.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
-
+SOURCE=..\..\src\msw\statbr95.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
-
+!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"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+!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
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\univ\notebook.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\radiobox.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
-
+SOURCE=..\..\src\msw\statline.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+!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
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\univ\radiobut.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\scrarrow.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
-
+SOURCE=..\..\src\msw\stattext.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
-
+!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"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+!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
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\univ\scrolbar.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\scrthumb.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
-
+SOURCE=..\..\src\msw\tabctrl.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+!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
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\univ\slider.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\spinbutt.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
-
+SOURCE=..\..\src\msw\tbar95.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
-
+!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"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+!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
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\univ\statbmp.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\statbox.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
-
+SOURCE=..\..\src\msw\textctrl.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+!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
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\univ\statline.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\stattext.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
-
+SOURCE=..\..\src\msw\tglbtn.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
-
+!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"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+!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
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\univ\statusbr.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\textctrl.cpp
+SOURCE=..\..\src\msw\timer.cpp
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\src\msw\tooltip.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\toplevel.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\src\msw\treectrl.cpp
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+# PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+# PROP Exclude_From_Build 1
 
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\src\univ\theme.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
+
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\toolbar.cpp
+SOURCE=..\..\src\msw\utilsgui.cpp
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\src\msw\ole\uuid.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\msw\uxtheme.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\src\msw\version.rc
 
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+!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
 
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-SOURCE=..\..\src\univ\topluniv.cpp
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
@@ -6942,480 +7130,7114 @@ SOURCE=..\..\src\univ\topluniv.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\themes\win32.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+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 Debug"
+# PROP Default_Filter ""
+# Begin Source File
 
+SOURCE=..\..\src\generic\accel.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
-# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1
 
-SOURCE=..\..\src\univ\winuniv.cpp
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+# PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
+
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
 # PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
 # PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
-# End Group
-# Begin Group "Setup Headers"
+# Begin Source File
 
-# PROP Default_Filter ""
+SOURCE=..\..\src\generic\busyinfo.cpp
+# End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\setup.h
+SOURCE=..\..\src\generic\buttonbar.cpp
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\src\generic\choicbkg.cpp
+# End Source File
+# Begin Source File
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+SOURCE=..\..\src\generic\choicdgg.cpp
+# End Source File
+# Begin Source File
 
-"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
+SOURCE=..\..\src\generic\clrpickerg.cpp
+# End Source File
+# Begin Source File
 
-# End Custom Build
+SOURCE=..\..\src\generic\colrdlgg.cpp
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
-# End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_0"
 
-# End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_1"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
 
-# End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug 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
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
 
-# End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_1"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+# PROP Exclude_From_Build 1
 
-"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release USE_AUI_0"
 
-# End Custom Build
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_1"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+# PROP Exclude_From_Build 1
 
-"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug USE_AUI_0"
 
-# End Custom Build
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+# PROP Exclude_From_Build 1
 
-"..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
 
-# End Custom Build
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+# PROP Exclude_From_Build 1
 
-"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_0"
 
-# End Custom Build
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_1"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release USE_AUI_0"
 
-# End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_1"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug USE_AUI_0"
 
-# End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_1"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
 
-"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
 
-# End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug 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
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
 
-# End Custom Build
 
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_1"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+# PROP Exclude_From_Build 1
 
-"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release USE_AUI_0"
 
-# End Custom Build
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+# PROP Exclude_From_Build 1
 
-"..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-# End Custom Build
+# PROP Exclude_From_Build 1
 
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+# PROP Exclude_From_Build 1
 
-"..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-# End Custom Build
+# PROP Exclude_From_Build 1
 
-!ENDIF
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-# End Source File
-# End Group
-# Begin Group "MSW Headers"
+# PROP Exclude_From_Build 1
 
-# PROP Default_Filter ""
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-SOURCE=..\..\include\wx\msw\accel.h
-# End Source File
-# Begin Source File
+# PROP Exclude_From_Build 1
 
-SOURCE=..\..\include\wx\msw\ole\access.h
-# End Source File
-# Begin Source File
+!ENDIF
 
-SOURCE=..\..\include\wx\msw\app.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\ole\automtn.h
+SOURCE=..\..\src\generic\combog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\bitmap.h
+SOURCE=..\..\src\generic\dcpsg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\bmpbuttn.h
+SOURCE=..\..\src\generic\dirctrlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\brush.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\dirdlgg.cpp
 
-SOURCE=..\..\include\wx\msw\button.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_1"
 
-SOURCE=..\..\include\wx\msw\caret.h
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\include\wx\msw\checkbox.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release USE_AUI_0"
 
-SOURCE=..\..\include\wx\msw\checklst.h
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\include\wx\msw\choice.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug USE_AUI_1"
 
-SOURCE=..\..\include\wx\msw\clipbrd.h
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\include\wx\msw\colordlg.h
-# End Source File
-# Begin Source File
+!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\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"
+
+# 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\filedlgg.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\filepickerg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\fontdlgg.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\fontpickerg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\imaglist.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\listbkg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\listctrl.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\logg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\mdig.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\msgdlgg.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\numdlgg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\panelg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\printps.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\prntdlgg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\progdlgg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\renderg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\scrlwing.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\selstore.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\spinctlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\splitter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\statusbr.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\generic\tabg.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\textdlgg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\tipwin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\toolbkg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\treebkg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\treectlg.cpp
+# End Source File
+# Begin Source File
+
+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"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\src\univ\bmpbuttn.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\univ\button.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\univ\checkbox.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\univ\checklst.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\univ\choice.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\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 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\univ\combobox.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\univ\control.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\univ\ctrlrend.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\univ\dialog.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\univ\framuniv.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\univ\gauge.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\univ\themes\gtk.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\univ\inpcons.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\univ\inphand.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\univ\listbox.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\univ\menu.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\univ\themes\metal.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\univ\notebook.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\univ\radiobox.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\univ\radiobut.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\univ\scrarrow.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\univ\scrolbar.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\univ\scrthumb.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\univ\slider.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\univ\spinbutt.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\univ\statbmp.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\univ\statbox.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\univ\statline.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\univ\stattext.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\univ\statusbr.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\univ\textctrl.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\univ\tglbtn.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\univ\theme.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\univ\toolbar.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\univ\topluniv.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\univ\themes\win32.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\univ\winuniv.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
+# End Group
+# Begin Group "Setup Headers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+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"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release USE_AUI_0"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_1"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug USE_AUI_0"
+
+# 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"
+
+# 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 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"
+
+# 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 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"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
+InputPath=..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug 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"
+
+# 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 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"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release USE_AUI_0"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_1"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug USE_AUI_0"
+
+# 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"
+
+# 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
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# 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
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\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
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\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
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+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"
+
+# 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 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"
+
+# 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 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"
+
+# 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 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"
+
+# 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 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"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_1"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release USE_AUI_0"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug USE_AUI_1"
+
+# 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"
+
+# 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 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"
+
+# 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 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"
+
+# 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 Debug USE_AUI_1"
+
+# 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 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"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
+
+# 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"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "MSW Headers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\accel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\access.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\activex.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\app.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\automtn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\bitmap.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\bmpbuttn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\brush.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\button.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\caret.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\checkbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\checklst.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\choice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\clipbrd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\colordlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\colour.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\combo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\combobox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\control.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\cursor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\dataform.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\dataobj.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\dataobj2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\datectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\dc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\dcclient.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\dcmemory.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\dcprint.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\dcscreen.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\dialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\dib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\dirdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\dragimag.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\dropsrc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\droptgt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\enhmeta.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\evtloop.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\fdrepdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\filedlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\font.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\fontdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\frame.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\gauge95.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\gdiimage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\genrcdefs.h
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release 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"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug 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"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release 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"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug 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"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release 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"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug 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"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release 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"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug 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"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release 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"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug 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"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release 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"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug 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"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release 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"
+
+# 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
 
-SOURCE=..\..\include\wx\msw\colour.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_1"
 
-SOURCE=..\..\include\wx\msw\combobox.h
-# End Source File
-# Begin Source File
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 
-SOURCE=..\..\include\wx\msw\control.h
-# End Source File
-# Begin Source File
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 
-SOURCE=..\..\include\wx\msw\cursor.h
-# End Source File
-# Begin Source File
+# End Custom Build
 
-SOURCE=..\..\include\wx\msw\ole\dataform.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug USE_AUI_0"
 
-SOURCE=..\..\include\wx\msw\ole\dataobj.h
-# End Source File
-# Begin Source File
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
 
-SOURCE=..\..\include\wx\msw\ole\dataobj2.h
-# End Source File
-# Begin Source File
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 
-SOURCE=..\..\include\wx\msw\dc.h
-# End Source File
-# Begin Source File
+# End Custom Build
 
-SOURCE=..\..\include\wx\msw\dcclient.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_1"
 
-SOURCE=..\..\include\wx\msw\dcmemory.h
-# End Source File
-# Begin Source File
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 
-SOURCE=..\..\include\wx\msw\dcprint.h
-# End Source File
-# Begin Source File
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
 
-SOURCE=..\..\include\wx\msw\dcscreen.h
-# End Source File
-# Begin Source File
+# End Custom Build
 
-SOURCE=..\..\include\wx\msw\dialog.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Release USE_AUI_0"
 
-SOURCE=..\..\include\wx\msw\dib.h
-# End Source File
-# Begin Source File
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
 
-SOURCE=..\..\include\wx\msw\dirdlg.h
-# End Source File
-# Begin Source File
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
 
-SOURCE=..\..\include\wx\msw\dragimag.h
-# End Source File
-# Begin Source File
+# End Custom Build
 
-SOURCE=..\..\include\wx\msw\ole\dropsrc.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_1"
 
-SOURCE=..\..\include\wx\msw\ole\droptgt.h
-# End Source File
-# Begin Source File
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 
-SOURCE=..\..\include\wx\msw\enhmeta.h
-# End Source File
-# Begin Source File
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
 
-SOURCE=..\..\include\wx\msw\evtloop.h
-# End Source File
-# Begin Source File
+# End Custom Build
 
-SOURCE=..\..\include\wx\msw\fdrepdlg.h
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "core - Win32 Debug USE_AUI_0"
 
-SOURCE=..\..\include\wx\msw\filedlg.h
-# End Source File
-# Begin Source File
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
 
-SOURCE=..\..\include\wx\msw\font.h
-# End Source File
-# Begin Source File
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "$(SETUPHDIR)\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
 
-SOURCE=..\..\include\wx\msw\fontdlg.h
-# End Source File
-# Begin Source File
+# End Custom Build
+
+!ENDIF
 
-SOURCE=..\..\include\wx\msw\frame.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\gauge95.h
+SOURCE=..\..\include\wx\msw\glcanvas.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\gdiimage.h
+SOURCE=..\..\include\wx\msw\helpbest.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\gdiobj.h
+SOURCE=..\..\include\wx\msw\helpchm.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\glcanvas.h
+SOURCE=..\..\include\wx\msw\helpwin.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\helpbest.h
+SOURCE=..\..\include\wx\msw\htmlhelp.h
 # End Source File
 # Begin Source File
 
@@ -7471,10 +14293,6 @@ SOURCE=..\..\include\wx\msw\msgdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\mslu.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\msw\msvcrt.h
 # End Source File
 # Begin Source File
@@ -7495,15 +14313,15 @@ SOURCE=..\..\include\wx\msw\pen.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\printdlg.h
+SOURCE=..\..\include\wx\msw\popupwin.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\printwin.h
+SOURCE=..\..\include\wx\msw\printdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\private.h
+SOURCE=..\..\include\wx\msw\printwin.h
 # End Source File
 # Begin Source File
 
@@ -7515,7 +14333,7 @@ SOURCE=..\..\include\wx\msw\radiobut.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\regconf.h
+SOURCE=..\..\include\wx\msw\rcdefs.h
 # End Source File
 # Begin Source File
 
@@ -7523,10 +14341,6 @@ SOURCE=..\..\include\wx\msw\region.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\registry.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\msw\scrolbar.h
 # End Source File
 # Begin Source File
@@ -7539,10 +14353,6 @@ SOURCE=..\..\include\wx\msw\slider95.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\slidrmsw.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\msw\sound.h
 # End Source File
 # Begin Source File
@@ -7587,10 +14397,6 @@ SOURCE=..\..\include\wx\msw\tbar95.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\tbarmsw.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\msw\textctrl.h
 # End Source File
 # Begin Source File
@@ -7619,11 +14425,15 @@ SOURCE=..\..\include\wx\msw\ole\uuid.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\window.h
+SOURCE=..\..\include\wx\msw\uxtheme.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\gnuwin32\winresrc.h
+SOURCE=..\..\include\wx\msw\uxthemep.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\window.h
 # End Source File
 # End Group
 # Begin Group "Generic Headers"
@@ -7635,6 +14445,14 @@ SOURCE=..\..\include\wx\generic\accel.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\busyinfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\buttonbar.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\calctrl.h
 # End Source File
 # Begin Source File
@@ -7643,10 +14461,30 @@ SOURCE=..\..\include\wx\generic\choicdgg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\clrpicker.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\clrpickerg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\colrdlgg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\combo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\dataview.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\datectrl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\dcpsg.h
 # End Source File
 # Begin Source File
@@ -7671,10 +14509,26 @@ SOURCE=..\..\include\wx\generic\filedlgg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\filepicker.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\filepickerg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\fontdlgg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\fontpicker.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\fontpickerg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\grid.h
 # End Source File
 # Begin Source File
@@ -7739,6 +14593,10 @@ SOURCE=..\..\include\wx\generic\progdlgg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\propdlg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\sashwin.h
 # End Source File
 # Begin Source File
@@ -7939,15 +14797,15 @@ SOURCE=..\..\include\wx\univ\window.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\include\wx\html\forcelnk.h
+SOURCE=..\..\include\wx\html\helpctrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\html\helpctrl.h
+SOURCE=..\..\include\wx\html\helpdata.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\html\helpdata.h
+SOURCE=..\..\include\wx\html\helpdlg.h
 # End Source File
 # Begin Source File
 
@@ -7955,6 +14813,10 @@ SOURCE=..\..\include\wx\html\helpfrm.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\html\helpwnd.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\html\htmlcell.h
 # End Source File
 # Begin Source File
@@ -8011,6 +14873,10 @@ SOURCE=..\..\include\wx\artprov.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\aui\aui.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\bitmap.h
 # End Source File
 # Begin Source File
@@ -8067,6 +14933,10 @@ SOURCE=..\..\include\wx\clipbrd.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\clrpicker.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\cmdproc.h
 # End Source File
 # Begin Source File
@@ -8083,6 +14953,10 @@ SOURCE=..\..\include\wx\colour.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\combo.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\combobox.h
 # End Source File
 # Begin Source File
@@ -8107,6 +14981,18 @@ SOURCE=..\..\include\wx\dataobj.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\dataview.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\datectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dateevt.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\dbgrid.h
 # End Source File
 # Begin Source File
@@ -8143,6 +15029,10 @@ SOURCE=..\..\include\wx\dcscreen.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\debugrpt.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\dialog.h
 # End Source File
 # Begin Source File
@@ -8163,10 +15053,18 @@ SOURCE=..\..\include\wx\display.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\display_impl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\dnd.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\aui\dockart.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\docmdi.h
 # End Source File
 # Begin Source File
@@ -8199,6 +15097,14 @@ SOURCE=..\..\include\wx\filedlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\filepicker.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\aui\floatpane.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\fmappriv.h
 # End Source File
 # Begin Source File
@@ -8215,6 +15121,10 @@ SOURCE=..\..\include\wx\fontenum.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\fontpicker.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\fontutil.h
 # End Source File
 # Begin Source File
@@ -8223,6 +15133,10 @@ SOURCE=..\..\include\wx\frame.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\aui\framemanager.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\gauge.h
 # End Source File
 # Begin Source File
@@ -8275,6 +15189,10 @@ SOURCE=..\..\include\wx\htmllbox.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\hyperlink.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\icon.h
 # End Source File
 # Begin Source File
@@ -8363,6 +15281,10 @@ SOURCE=..\..\include\wx\mdi.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\mediactrl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\menu.h
 # End Source File
 # Begin Source File
@@ -8391,6 +15313,10 @@ SOURCE=..\..\include\wx\numdlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\odcombo.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\ownerdrw.h
 # End Source File
 # Begin Source File
@@ -8431,6 +15357,10 @@ SOURCE=..\..\include\wx\progdlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\propdlg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\ptr_scpd.h
 # End Source File
 # Begin Source File
@@ -8459,6 +15389,22 @@ SOURCE=..\..\include\wx\renderer.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\richtext\richtextbuffer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextstyles.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextxml.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\sashwin.h
 # End Source File
 # Begin Source File
@@ -8571,6 +15517,10 @@ SOURCE=..\..\include\wx\toolbar.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\toolbook.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\tooltip.h
 # End Source File
 # Begin Source File
@@ -8583,6 +15533,10 @@ SOURCE=..\..\include\wx\treebase.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\treebook.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\treectrl.h
 # End Source File
 # Begin Source File
@@ -8627,6 +15581,10 @@ SOURCE=..\..\include\wx\wizard.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\wupdlock.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\wxhtml.h
 # End Source File
 # Begin Source File
@@ -8663,14 +15621,38 @@ SOURCE=..\..\include\wx\xrc\xh_choic.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xrc\xh_choicbk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_clrpicker.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_combo.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xrc\xh_datectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_dirpicker.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_dlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xrc\xh_filepicker.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_fontpicker.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_frame.h
 # End Source File
 # Begin Source File
@@ -8683,18 +15665,34 @@ SOURCE=..\..\include\wx\xrc\xh_gdctl.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xrc\xh_grid.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_html.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xrc\xh_hyperlink.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_listb.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xrc\xh_listbk.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_listc.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xrc\xh_mdi.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_menu.h
 # End Source File
 # Begin Source File
@@ -8775,6 +15773,10 @@ SOURCE=..\..\include\wx\xrc\xh_tree.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xrc\xh_treebk.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\xrc\xh_unkwn.h
 # End Source File
 # Begin Source File